From 341ed63f47766570229567dd45c04dc0d6db1e94 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 20 Mar 2017 22:32:58 +0100 Subject: gnu: ngircd: Use ‘modify-phases’ syntax. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/messaging.scm (ngircd)[arguments]: Use ‘modify-phases’. --- gnu/packages/messaging.scm | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index adc7b01383..535a1d3c62 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -235,28 +235,27 @@ dictionaries. HexChat can be extended with multiple addons.") '("--with-pam") '())) #:phases - ;; Necessary for the test suite. - (alist-cons-after - 'configure 'post-configure - (lambda _ - (substitute* "src/ngircd/Makefile" - (("/bin/sh") (which "sh"))) - ;; The default getpid.sh does a sloppy grep over 'ps -ax' output, - ;; which fails arbitrarily. - (with-output-to-file "src/testsuite/getpid.sh" - (lambda () - (display - (string-append - "#!" (which "sh") "\n" - "ps -C \"$1\" -o pid=\n")))) - ;; Our variant of getpid.sh does not work for interpreter names if a - ;; shebang script is run directly as "./foo", so patch cases where - ;; the test suite relies on this. - (substitute* "src/testsuite/start-server.sh" - ;; It runs 'getpid.sh sh' to test if it works at all. Run it on - ;; 'make' instead. - (("getpid.sh sh") "getpid.sh make"))) - %standard-phases))) + (modify-phases %standard-phases + ;; Necessary for the test suite. + (add-after 'configure 'post-configure + (lambda _ + (substitute* "src/ngircd/Makefile" + (("/bin/sh") (which "sh"))) + ;; The default getpid.sh does a sloppy grep over 'ps -ax' output, + ;; which fails arbitrarily. + (with-output-to-file "src/testsuite/getpid.sh" + (lambda () + (display + (string-append + "#!" (which "sh") "\n" + "ps -C \"$1\" -o pid=\n")))) + ;; Our variant of getpid.sh does not match interpreter names + ;; when the script's shebang is invoked directly as "./foo". + ;; Patch cases where the test suite relies on this. + (substitute* "src/testsuite/start-server.sh" + ;; It runs 'getpid.sh sh' to test if it works at all. Run it on + ;; 'make' instead. + (("getpid.sh sh") "getpid.sh make"))))))) (home-page "http://ngircd.barton.de/") (synopsis "Lightweight Internet Relay Chat server for small networks") (description -- cgit 1.4.1