From 58246f965024b4d337115a377324656d0d3df030 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 22 Feb 2018 17:09:49 +0100 Subject: gnu: strongswan: Separate phases. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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(-) (limited to 'gnu/packages') 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))) -- cgit v1.2.3