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/xorg.scm | |
parent | 2e838890ff989128e8a78eea574d1ad158dd6361 (diff) | |
parent | c320011da5e743f47220f380c818e95394f6d9c0 (diff) | |
download | guix-53c85e97dcc264da5ff5cd4e3be4d47028f4d726.tar guix-53c85e97dcc264da5ff5cd4e3be4d47028f4d726.tar.gz |
Merge branch 'core-updates'
Conflicts:
gnu/packages/gnunet.scm
Diffstat (limited to 'gnu/packages/xorg.scm')
-rw-r--r-- | gnu/packages/xorg.scm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 8ff1532879..3a53fdf3a6 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -26,8 +26,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages flex) #:use-module (gnu packages fontutils) - #: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 gperf) @@ -1303,7 +1302,7 @@ tracking.") "0dd737ch4q9gr151wff1m3q2j7wf3pip4y81601xdrsh8wipxnx6")))) (build-system gnu-build-system) (inputs - `(("gettext" ,gnu:gettext) + `(("gettext" ,gnu-gettext) ("libxt" ,libxt) ("xproto" ,xproto) ("libxext" ,libxext) @@ -3236,7 +3235,7 @@ tracking.") "1nmb7ma8rqryicc5xqrn2hm5pwp5lkf7nj28bwbf63mz2r0mk892")))) (build-system gnu-build-system) (inputs - `(("gettext" ,gnu:gettext) + `(("gettext" ,gnu-gettext) ("intltool" ,intltool) ("libx11" ,libx11) ("pkg-config" ,pkg-config) |