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/gnunet.scm | |
parent | 2e838890ff989128e8a78eea574d1ad158dd6361 (diff) | |
parent | c320011da5e743f47220f380c818e95394f6d9c0 (diff) | |
download | guix-53c85e97dcc264da5ff5cd4e3be4d47028f4d726.tar.gz |
Merge branch 'core-updates'
Conflicts: gnu/packages/gnunet.scm
Diffstat (limited to 'gnu/packages/gnunet.scm')
-rw-r--r-- | gnu/packages/gnunet.scm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index a92fcad2b0..69cd74ee66 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -21,8 +21,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages geeqie) - #:use-module ((gnu packages gettext) - #:renamer (symbol-prefix-proc 'gnu:)) + #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) #:use-module (gnu packages gnutls) @@ -71,7 +70,7 @@ `(("exiv2" ,exiv2) ("flac" ,flac) ("ffmpeg" ,ffmpeg) - ("gettext" ,gnu:gettext) + ("gettext" ,gnu-gettext) ("glib" ,glib) ("gstreamer" ,gstreamer) ("gst-plugins-base" ,gst-plugins-base) |