From 4e2f98c5394c515a5849be3aad6d06e8ad89807b Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 27 Oct 2014 03:30:22 -0400 Subject: gnu: Add prefix to license imports in (gnu packages feh). * gnu/packages/feh.scm: Import (guix licenses) with #:prefix license: to avoid importing 'imlib2' from both (gnu packages image) and (guix licenses). --- gnu/packages/feh.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/feh.scm') diff --git a/gnu/packages/feh.scm b/gnu/packages/feh.scm index 3707a53957..84edad419e 100644 --- a/gnu/packages/feh.scm +++ b/gnu/packages/feh.scm @@ -24,7 +24,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) - #:use-module (guix licenses)) + #:use-module ((guix licenses) #:prefix license:)) (define-public feh (package @@ -61,5 +61,6 @@ actions.") ;; The license is really the Expat license, with additional wording in the ;; 2nd paragraph: "acknowledgment shall be given in the documentation and ;; software packages that this Software was used." - (license (x11-style "file://COPYING" - "See 'COPYING' in the distribution.")))) + (license (license:x11-style + "file://COPYING" + "See 'COPYING' in the distribution.")))) -- cgit 1.4.1