ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 05:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: guile: Add Bash as an input, to permit cross-compilation.

Browse source 
* gnu/packages/guile.scm (guile-2.0): Add Bash as an input
  when (%current-target-system) is true.  Use %standard-cross-phases as
  a basis when (%current-target-system) is true.
This commit is contained in:
Ludovic Courtès 2013-05-26 23:45:59 +02:00
parent 9a97b8144d
commit 9c782445fb
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gnu/packages/guile.scm
View file

@ -19,6 +19,7 @@
(define-module (gnu packages guile)
#:use-module (guix licenses)
#:use-module (gnu packages)
#:use-module (gnu packages bash)
#:use-module (gnu packages bdw-gc)
#:use-module (gnu packages gawk)
#:use-module (gnu packages gperf)
@ -115,7 +116,12 @@ (define-public guile-2.0
(build-system gnu-build-system)
(native-inputs `(("pkgconfig" ,pkg-config)))
(inputs `(("libffi" ,libffi)
("readline" ,readline)))
("readline" ,readline)
;; TODO: On next core-updates, make Bash input unconditional.
,@(if (%current-target-system)
`(("bash" ,bash))
'())))
(propagated-inputs
`( ;; These ones aren't normally needed here, but since `libguile-2.0.la'
@ -133,14 +139,16 @@ (define-public guile-2.0
(self-native-input? #t)
(arguments
'(#:phases (alist-cons-before
`(#: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)))
,(if (%current-target-system)
'%standard-cross-phases
'%standard-phases))))
(native-search-paths
(list (search-path-specification