nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: go@1.12: Apply patch from a build phase. 

This is a followup to b938892551.

* gnu/packages/golang.scm (go-1.12)[source]: Remove 'patches'.
[arguments]: In 'pre-build' phase, invoke "patch".
[native-inputs]: Add "go-skip-gc-test.patch".
This commit is contained in:
Ludovic Courtès 2019-09-17 11:31:37 +02:00
parent b938892551
commit ae71bef532
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gnu/packages/golang.scm
View File

@ -409,8 +409,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
name version ".src.tar.gz")) name version ".src.tar.gz"))
(sha256 (sha256
(base32 (base32
"04rvwj69gmw3bz8pw5pf10r21ar0pgpnswp15nkddf04dxyl9s4m")) "04rvwj69gmw3bz8pw5pf10r21ar0pgpnswp15nkddf04dxyl9s4m"))))
(patches (search-patches "go-skip-gc-test.patch"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments go-1.4) (substitute-keyword-arguments (package-arguments go-1.4)
((#:phases phases) ((#:phases phases)
@ -425,6 +424,12 @@ in the style of communicating sequential processes (@dfn{CSP}).")
(string-append (assoc-ref inputs "tzdata") "/share/zoneinfo")) (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo"))
(output (assoc-ref outputs "out"))) (output (assoc-ref outputs "out")))
;; Having the patch in the 'patches' field of <origin> breaks
;; the 'TestServeContent' test due to the fact that
;; timestamps are reset. Thus, apply it from here.
(invoke "patch" "-p2" "--force" "-i"
(assoc-ref inputs "go-skip-gc-test.patch"))
;; A side effect of these test scripts is testing ;; A side effect of these test scripts is testing
;; cgo. Attempts at using cgo flags and directives with these ;; cgo. Attempts at using cgo flags and directives with these
;; scripts as specified here (https://golang.org/cmd/cgo/) ;; scripts as specified here (https://golang.org/cmd/cgo/)
@ -576,6 +581,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
#t))))))) #t)))))))
(native-inputs (native-inputs
`(("go" ,go-1.4) `(("go" ,go-1.4)
("go-skip-gc-test.patch" ,(search-patch "go-skip-gc-test.patch"))
,@(match (%current-system) ,@(match (%current-system)
((or "armhf-linux" "aarch64-linux") ((or "armhf-linux" "aarch64-linux")
`(("gold" ,binutils-gold))) `(("gold" ,binutils-gold)))