From 5b3e3ed9e8fddb36b7d884ab5d2dd6f0a4ad5220 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 7 Aug 2017 23:09:29 +0300 Subject: [PATCH 3/3] gnu: go: Build with address@hidden * gnu/packages/golang.scm (address@hidden)[inputs]: Remove gcc-lib. [native-inputs]: Remove address@hidden, add address@hidden --- gnu/packages/golang.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 70cae6d87..3dee1d72b 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016 Matthew Jordan ;;; Copyright © 2016 Andy Wingo ;;; Copyright © 2016 Ludovic Courtès @@ -219,7 +219,7 @@ sequential processes (CSP) concurrent programming features added.") (replace 'prebuild ;; TODO: Most of this could be factorized with Go 1.4. (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((gcclib (string-append (assoc-ref inputs "gcc:lib") "/lib")) + (let* ((gcclib (string-append (assoc-ref inputs "go") "/lib")) (ld (string-append (assoc-ref inputs "libc") "/lib")) (loader (car (find-files ld "^ld-linux.+"))) (net-base (assoc-ref inputs "net-base")) @@ -362,8 +362,11 @@ sequential processes (CSP) concurrent programming features added.") "LICENSE" "VERSION" "CONTRIBUTING.md" "robots.txt")) (copy-recursively "../" output)))))))) + (inputs + `(("tzdata" ,tzdata) + ("pcre" ,pcre))) (native-inputs - `(("go" ,go-1.4) + `(("go" ,gccgo-7) ,@(package-native-inputs go-1.4))))) (define-public go go-1.8) -- 2.14.0