diff options
Diffstat (limited to 'gnu/packages/golang.scm')
| -rw-r--r-- | gnu/packages/golang.scm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index a830afa022..d3ef39a2e6 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <[email protected]> ;;; Copyright © 2016 Matthew Jordan <[email protected]> ;;; Copyright © 2016 Andy Wingo <[email protected]> -;;; Copyright © 2016, 2019 Ludovic Courtès <[email protected]> +;;; Copyright © 2016, 2019, 2021 Ludovic Courtès <[email protected]> ;;; Copyright © 2016, 2017 Petter <[email protected]> ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Leo Famulari <[email protected]> ;;; Copyright © 2017 Sergei Trofimovich <[email protected]> @@ -1060,11 +1060,11 @@ your Go binary to be later served from an http.FileSystem.") (add-before 'build 'prebuild (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((gcclib (string-append (assoc-ref inputs "gcc:lib") "/lib")) - (ld (string-append (assoc-ref inputs "libc") "/lib")) + (ld (dirname (search-input-file inputs "/lib/libc.so"))) (loader (car (find-files ld "^ld-linux.+"))) (net-base (assoc-ref inputs "net-base")) (tzdata-path - (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo")) + (search-input-directory inputs "share/zoneinfo")) (output (assoc-ref outputs "out"))) ;; Removing net/ tests, which fail when attempting to access @@ -1140,7 +1140,7 @@ your Go binary to be later served from an http.FileSystem.") (lambda* (#:key outputs inputs #:allow-other-keys) (let* ((output (assoc-ref outputs "out")) (doc_out (assoc-ref outputs "doc")) - (bash (string-append (assoc-ref inputs "bash") "bin/bash")) + (bash (search-input-file inputs "bin/bash")) (docs (string-append doc_out "/share/doc/" ,name "-" ,version)) (tests (string-append (assoc-ref outputs "tests") "/share/" ,name "-" ,version))) @@ -1208,11 +1208,11 @@ in the style of communicating sequential processes (@dfn{CSP}).") (replace 'prebuild (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((gcclib (string-append (assoc-ref inputs "gcc:lib") "/lib")) - (ld (string-append (assoc-ref inputs "libc") "/lib")) + (ld (dirname (search-input-file inputs "/lib/libc.so"))) (loader (car (find-files ld "^ld-linux.+"))) (net-base (assoc-ref inputs "net-base")) (tzdata-path - (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo")) + (search-input-directory inputs "share/zoneinfo")) (output (assoc-ref outputs "out"))) ;; Having the patch in the 'patches' field of <origin> breaks |