nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Eric Bavier 2015-06-11 17:51:47 -05:00
parent 6508ce55e9
commit 48d21d6cd6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu/packages/haskell.scm
View File

@ -144,7 +144,7 @@
(ghc-bootstrap-prefix (ghc-bootstrap-prefix
(string-append ghc-bootstrap-path "/usr" ))) (string-append ghc-bootstrap-path "/usr" )))
(alist-cons-after (alist-cons-after
'unpack-bin 'unpack-and-fix-testsuite 'unpack-bin 'unpack-testsuite-and-fix-bins
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(with-directory-excursion ".." (with-directory-excursion ".."
(copy-file (assoc-ref inputs "ghc-testsuite") (copy-file (assoc-ref inputs "ghc-testsuite")
@ -155,7 +155,9 @@
"testsuite/timeout/timeout.py" "testsuite/timeout/timeout.py"
"testsuite/timeout/timeout.hs" "testsuite/timeout/timeout.hs"
"testsuite/tests/rename/prog006/Setup.lhs" "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/sh") (which "sh"))
(("/bin/rm") "rm")) (("/bin/rm") "rm"))
#t) #t)