1 files changed, 38 insertions, 43 deletions
diff --git a/src/org/euandre/packages.scm b/src/org/euandre/packages.scm
index d5598b5..35aaa65 100644
--- a/src/org/euandre/packages.scm
+++ b/src/org/euandre/packages.scm
@@ -176,7 +176,13 @@
     (build-system gnu-build-system)
     (arguments
       (list
-       #:make-flags #~(list (string-append "PREFIX=" #$output))
+       #:strip-binaries? #f
+       #:make-flags
+       #~(list
+          "-e"
+          (string-append "CC="      #$(cc-for-target))
+          (string-append "PREFIX="  #$output)
+          (string-append "VERSION=" #$version))
        #:phases
        #~(modify-phases %standard-phases
            (delete 'configure))))
@@ -283,48 +289,37 @@
        l))
 
 (define-public (gopkg name inputs version checksum)
-  (package
-    (inherit
-      (pkg
-       name
-       version
-       checksum))
-    (arguments
-      (list
-       #:strip-binaries? #f
-       #:make-flags
-       #~(list
-          "-e"
-          (string-append "PREFIX=" #$output)
-          (string-append "VERSION=" #$version)
-          (string-append "CC=" #$(cc-for-target)))
-       #:phases
-       #~(modify-phases %standard-phases
-           (delete 'configure)
-           (add-before 'build 'setenv-golang
-             (lambda _
-               (define (path->flags option)
-                 (let ((search-path (getenv "GOLIBPACKPATH")))
-                   (string-join
-                    (map (lambda (path)
-                           (string-append option " " path))
-                         (if search-path
-                           (string-split search-path #\:)
-                           '()))
-                    " ")))
-               (setenv "GOCFLAGS"  (path->flags "-I"))
-               (setenv "GOLDFLAGS" (path->flags "-L")))))))
-    (native-inputs
-      (append
-       (format-inputs
-        (list q:go-full))
-       inputs))
-    (native-search-paths
-      (list
-       (search-path-specification
-         (variable "GOLIBPACKPATH")
-         (files
-           (list "lib/go")))))))
+  (let ((p (pkg name version checksum)))
+    (package
+      (inherit p)
+      (arguments
+        (substitute-keyword-arguments (package-arguments p)
+          ((#:phases phases)
+           #~(modify-phases #$phases
+               (add-before 'build 'setenv-golang
+                 (lambda _
+                   (define (path->flags option)
+                     (let ((search-path (getenv "GOLIBPACKPATH")))
+                       (string-join
+                        (map (lambda (path)
+                               (string-append option " " path))
+                             (if search-path
+                               (string-split search-path #\:)
+                               '()))
+                        " ")))
+                   (setenv "GOCFLAGS"  (path->flags "-I"))
+                   (setenv "GOLDFLAGS" (path->flags "-L"))))))))
+      (native-inputs
+        (append
+         (format-inputs
+          (list q:go-full))
+         inputs))
+      (native-search-paths
+        (list
+         (search-path-specification
+           (variable "GOLIBPACKPATH")
+           (files
+             (list "lib/go"))))))))
 
 
 (define-public guuid