diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2018-02-22 17:09:49 +0100 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2018-02-22 17:24:37 +0100 |
| commit | 58246f965024b4d337115a377324656d0d3df030 (patch) | |
| tree | 1153b04a3b31ddf3fe2b8c399db714afc51b6a9c /gnu | |
| parent | c85eca6253aa83df87afad9b175a4183b9738549 (diff) | |
| download | gnu-guix-58246f965024b4d337115a377324656d0d3df030.tar gnu-guix-58246f965024b4d337115a377324656d0d3df030.tar.gz | |
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’.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/networking.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 1927dfd7ea..cd3f4f124b 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -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))) |