diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-03-31 22:41:54 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-03-31 22:41:54 +0200 |
| commit | 023dd28a303961cbf2848f13d3156c162d5e76c0 (patch) | |
| tree | 2464aa01885d2a9f0c52fe893ce0afc8adff6ee7 /gnu/packages/messaging.scm | |
| parent | a06af9f5284f7b5b649f5dc32131de18115ec92e (diff) | |
| parent | 15aa2c38429a5785ed08519c88ff89a0b7027f0f (diff) | |
| download | guix-023dd28a303961cbf2848f13d3156c162d5e76c0.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/messaging.scm')
| -rw-r--r-- | gnu/packages/messaging.scm | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 462c500248..fd857b1ec3 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -201,7 +201,22 @@ dictionaries. HexChat can be extended with multiple addons.") 'configure 'post-configure (lambda _ (substitute* "src/ngircd/Makefile" - (("/bin/sh") (which "sh")))) + (("/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))) (home-page "http://ngircd.barton.de/") (synopsis "Lightweight Internet Relay Chat server for small networks") |