From 002fbd72657b07802627f76eff4280e03be86323 Mon Sep 17 00:00:00 2001
From: pjotrp
Date: Fri, 18 Mar 2016 22:18:02 -0500
Subject: fix conflict

---
 gn/packages/pocl.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gn')

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)
-- 
cgit v1.2.3