aboutsummaryrefslogtreecommitdiff
path: root/gn/packages
diff options
context:
space:
mode:
authorpjotrp2016-03-18 22:18:02 -0500
committerpjotrp2016-03-18 22:18:02 -0500
commit002fbd72657b07802627f76eff4280e03be86323 (patch)
treea439de1ffc48d8b9b6cffc57a8dec721bc3d2692 /gn/packages
parente9a4fd0b609d4d1ff6b3a622d4f590d092e6def8 (diff)
downloadguix-bioinformatics-002fbd72657b07802627f76eff4280e03be86323.tar.gz
fix conflict
Diffstat (limited to 'gn/packages')
-rw-r--r--gn/packages/pocl.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/gn/packages/pocl.scm b/gn/packages/pocl.scm
index 39f16c0..7d61526 100644
--- a/gn/packages/pocl.scm
+++ b/gn/packages/pocl.scm
@@ -52,7 +52,7 @@
#:use-module (gnu packages version-control)
#:use-module (gnu packages ruby)
#:use-module (gnu packages gnupg)
- #:use-module (gnu packages zip)
+ #:use-module ((gnu packages zip) #:prefix gnuzip:)
#:use-module (gnu packages linux))
(define-public pocl
@@ -131,7 +131,7 @@
(sha256
(base32
"1rgaixwnxmrq2aq4kcdvs0yx7i6krakarya9vqs7qwsv5hzc32hc"))))
- (inputs `(("zip" ,zip)
+ (inputs `(("zip" ,gnuzip:zip)
("autoconf" ,autoconf)
("automake" ,automake)
("ruby" ,ruby)