diff options
| author | Eric Bavier <bavier@member.fsf.org> | 2015-06-11 17:51:47 -0500 |
|---|---|---|
| committer | Eric Bavier <bavier@member.fsf.org> | 2015-06-11 18:55:49 -0500 |
| commit | 48d21d6cd600cabc147cfec243518931bbc3169a (patch) | |
| tree | fc3e1b14c5c278014ab2fb5fe48431944c6ffe4b | |
| parent | 6508ce55e95b0472b2212befcb56919eb44fb41c (diff) | |
| download | guix-48d21d6cd600cabc147cfec243518931bbc3169a.tar.gz | |
gnu: ghc: Patch runtime references to /bin/sh.
* gnu/packages/haskell.scm (ghc)[arguments]: Rename 'unpack-and-fix-testsuite' phase to 'unpack-testsuite-and-fix-bins'. Patch source files that reference /bin/sh.
| -rw-r--r-- | gnu/packages/haskell.scm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index ac87de540e..75bbb24479 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -144,7 +144,7 @@ (ghc-bootstrap-prefix (string-append ghc-bootstrap-path "/usr" ))) (alist-cons-after - 'unpack-bin 'unpack-and-fix-testsuite + 'unpack-bin 'unpack-testsuite-and-fix-bins (lambda* (#:key inputs outputs #:allow-other-keys) (with-directory-excursion ".." (copy-file (assoc-ref inputs "ghc-testsuite") @@ -155,7 +155,9 @@ "testsuite/timeout/timeout.py" "testsuite/timeout/timeout.hs" "testsuite/tests/rename/prog006/Setup.lhs" - "testsuite/tests/programs/life_space_leak/life.test") + "testsuite/tests/programs/life_space_leak/life.test" + "libraries/process/System/Process/Internals.hs" + "libraries/unix/cbits/execvpe.c") (("/bin/sh") (which "sh")) (("/bin/rm") "rm")) #t) |