05/05: gnu: strongswan: Separate phases.

[Tobias Geerinckx-Rice]

nckx pushed a commit to branch master
in repository guix.

commit 58246f965024b4d337115a377324656d0d3df030
Author: Tobias Geerinckx-Rice <address@hidden>
Date:   Thu Feb 22 17:09:49 2018 +0100

    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’.
---
 gnu/packages/networking.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 1927dfd..cd3f4f1 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)))