diff options
author | Ludovic Courtès <ludo@gnu.org> | 2013-11-23 22:30:10 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2013-11-23 22:30:10 +0100 |
commit | 53c85e97dcc264da5ff5cd4e3be4d47028f4d726 (patch) | |
tree | 8984fefeb61e0c165bf960fdfa3cd11355d02ba3 /gnu/packages/glib.scm | |
parent | 2e838890ff989128e8a78eea574d1ad158dd6361 (diff) | |
parent | c320011da5e743f47220f380c818e95394f6d9c0 (diff) | |
download | guix-patches-53c85e97dcc264da5ff5cd4e3be4d47028f4d726.tar guix-patches-53c85e97dcc264da5ff5cd4e3be4d47028f4d726.tar.gz |
Merge branch 'core-updates'
Conflicts:
gnu/packages/gnunet.scm
Diffstat (limited to 'gnu/packages/glib.scm')
-rw-r--r-- | gnu/packages/glib.scm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 61ba0b944e..fc65f304fc 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -29,8 +29,7 @@ #:use-module (gnu packages bison) #:use-module (gnu packages compression) #:use-module (gnu packages flex) - #:use-module ((gnu packages gettext) - #:renamer (symbol-prefix-proc 'guix:)) + #:use-module (gnu packages gettext) #:use-module (gnu packages gtk) #:use-module (gnu packages libffi) #:use-module (gnu packages perl) @@ -124,7 +123,7 @@ shared NFS home directories.") "doc")) ; 20 MiB of GTK-Doc reference (inputs `(("coreutils" ,coreutils) - ("gettext" ,guix:gettext) + ("gettext" ,gnu-gettext) ("libffi" ,libffi) ("pkg-config" ,pkg-config) ("python" ,python-wrapper) @@ -224,7 +223,7 @@ bindings to call into the C library.") (propagated-inputs `(;; Propagate gettext because users expect it to be there, and so does ;; the `intltool-update' script. - ("gettext" ,guix:gettext) + ("gettext" ,gnu-gettext) ;; `file' is used by `intltool-update' too. ("file" ,file) |