From 6b345e06cd9e074cf589b34e78fa3ff6d33aa822 Mon Sep 17 00:00:00 2001 From: Nikita Karetnikov Date: Tue, 27 Nov 2012 20:06:18 +0000 Subject: [PATCH] distro: Import 'gettext' under a different name. * distro/packages/nano.scm, distro/packages/wget.scm: Import 'gettext' from (distro packages gettext) under 'guix:gettext'. --- distro/packages/nano.scm | 5 +++-- distro/packages/wget.scm | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/distro/packages/nano.scm b/distro/packages/nano.scm index e4a39a8b27..e87c679f1b 100644 --- a/distro/packages/nano.scm +++ b/distro/packages/nano.scm @@ -17,7 +17,8 @@ ;;; along with Guix. If not, see . (define-module (distro packages nano) - #:use-module (distro packages gettext) + #:use-module ((distro packages gettext) + #:renamer (symbol-prefix-proc 'guix:)) #:use-module (distro packages ncurses) #:use-module (guix packages) #:use-module (guix download) @@ -37,7 +38,7 @@ "0yp6pid67k8h7394spzw0067fl2r7rxm2b6kfccg87g8nlry2s5y")))) (build-system gnu-build-system) (inputs - `(("gettext" ,gettext) + `(("gettext" ,guix:gettext) ("ncurses" ,ncurses))) (home-page "http://www.nano-editor.org/") (synopsis diff --git a/distro/packages/wget.scm b/distro/packages/wget.scm index db81042ec5..9d877ec7cd 100644 --- a/distro/packages/wget.scm +++ b/distro/packages/wget.scm @@ -17,7 +17,8 @@ ;;; along with Guix. If not, see . (define-module (distro packages wget) - #:use-module (distro packages gettext) + #:use-module ((distro packages gettext) + #:renamer (symbol-prefix-proc 'guix:)) #:use-module (distro packages gnutls) #:use-module (distro packages perl) #:use-module (guix packages) @@ -40,7 +41,7 @@ (inputs `(("gnutls" ,gnutls) ("perl" ,perl) - ("gettext" ,gettext))) + ("gettext" ,guix:gettext))) (arguments '(#:phases (alist-cons-before 'build 'patch-/usr/bin/env -- 2.20.1