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

gnu: strongswan: Separate phases. 

* gnu/packages/networking.scm (strongswan)[arguments]: Split
‘adjust-to-environment’ phase into ‘patch-command-file-names’ and
‘set-up-test-environment’.
This commit is contained in:
Tobias Geerinckx-Rice 2018-02-22 17:09:49 +01:00
parent c85eca6253
commit 58246f9650
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnu/packages/networking.scm
View File

@ -1596,9 +1596,8 @@ displays the results in real time.")
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'build 'adjust-to-environment
(add-before 'build 'patch-command-file-names
(lambda* (#:key inputs #:allow-other-keys)
;; Adjust file names.
(substitute* "src/libstrongswan/utils/process.c"
(("/bin/sh")
(string-append (assoc-ref inputs "bash") "/bin/sh")))
@ -1607,8 +1606,9 @@ displays the results in real time.")
(("/bin/sh") (which "sh"))
(("/bin/echo") (which "echo"))
(("cat") (which "cat")))
;; This is needed for tests.
#t))
(add-before 'check 'set-up-test-environment
(lambda* (#:key inputs #:allow-other-keys)
(setenv "TZDIR" (string-append (assoc-ref inputs "tzdata")
"/share/zoneinfo"))
#t)))