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

distro: guile: Patch (ice-9 popen) to use the right shell. 

* distro/packages/guile.scm (guile-2.0): Add `pre-configure'.
* distro/packages/base.scm (guile-final): Adjust to preserve the
  `pre-configure' phase.
This commit is contained in:
Ludovic Courtès 2012-12-20 23:07:46 +01:00
parent eca63d3df8
commit 8ffaa93bff
2 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
distro/packages/base.scm
View File

@ -969,20 +969,22 @@ store.")
;; Libtool, so that that dependency is isolated in the "bin" output. ;; Libtool, so that that dependency is isolated in the "bin" output.
(let ((guile (package (inherit guile-2.0/fixed) (let ((guile (package (inherit guile-2.0/fixed)
(arguments (arguments
`(#:phases (substitute-keyword-arguments
(alist-cons-before (package-arguments guile-2.0/fixed)
'patch-source-shebangs 'delete-encoded-test ((#:phases phases)
(lambda* (#:key inputs #:allow-other-keys) `(alist-cons-before
;; %BOOTSTRAP-GUILE doesn't know about encodings other 'patch-source-shebangs 'delete-encoded-test
;; than UTF-8. That test declares an ISO-8859-1 (lambda* (#:key inputs #:allow-other-keys)
;; encoding, which prevents `patch-shebang' from ;; %BOOTSTRAP-GUILE doesn't know about encodings other
;; working, so skip it. ;; than UTF-8. That test declares an ISO-8859-1
(call-with-output-file ;; encoding, which prevents `patch-shebang' from
"test-suite/standalone/test-command-line-encoding2" ;; working, so skip it.
(lambda (p) (call-with-output-file
(format p "#!~a/bin/bash\nexit 77" "test-suite/standalone/test-command-line-encoding2"
(assoc-ref inputs "bash"))))) (lambda (p)
%standard-phases)))))) (format p "#!~a/bin/bash\nexit 77"
(assoc-ref inputs "bash")))))
,phases)))))))
(package-with-bootstrap-guile (package-with-bootstrap-guile
(package-with-explicit-inputs guile (package-with-explicit-inputs guile
%boot4-inputs %boot4-inputs

10
distro/packages/guile.scm
View File

@ -120,6 +120,16 @@ extensible. It supports many SRFIs.")
(self-native-input? #t) (self-native-input? #t)
(arguments
'(#:phases (alist-cons-before
'configure 'pre-configure
(lambda* (#:key inputs #:allow-other-keys)
(let ((bash (assoc-ref inputs "bash")))
(substitute* "module/ice-9/popen.scm"
(("/bin/sh")
(string-append bash "/bin/bash")))))
%standard-phases)))
(synopsis "GNU Guile 2.0, an embeddable Scheme implementation") (synopsis "GNU Guile 2.0, an embeddable Scheme implementation")
(description (description
"GNU Guile is an implementation of the Scheme programming language, with "GNU Guile is an implementation of the Scheme programming language, with