diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2011-11-13 21:28:35 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2011-11-13 21:28:35 +0000 |
| commit | e98264fe8f09795f337608758a9d6cd8cf620050 (patch) | |
| tree | 367cd3a8c540131916be5672edf60f7a65c661aa /pkgs/development/interpreters/guile | |
| parent | db1b4e2edc6dbcf97de0cd74af0c3c1a5846dc8f (diff) | |
| download | nixlib-e98264fe8f09795f337608758a9d6cd8cf620050.tar nixlib-e98264fe8f09795f337608758a9d6cd8cf620050.tar.gz nixlib-e98264fe8f09795f337608758a9d6cd8cf620050.tar.bz2 nixlib-e98264fe8f09795f337608758a9d6cd8cf620050.tar.lz nixlib-e98264fe8f09795f337608758a9d6cd8cf620050.tar.xz nixlib-e98264fe8f09795f337608758a9d6cd8cf620050.tar.zst nixlib-e98264fe8f09795f337608758a9d6cd8cf620050.zip | |
GNU Guile: Fix cross-compilation.
svn path=/nixpkgs/trunk/; revision=30415
Diffstat (limited to 'pkgs/development/interpreters/guile')
| -rw-r--r-- | pkgs/development/interpreters/guile/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 333496057368..839de3c053d4 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -14,11 +14,8 @@ rec { sha256 = "14rhlpxxa4v5y3gl992l7lnd5qnqawx0a84idnwq0w2qviwcvsyj"; }; - buildNativeInputs = [ xz ]; - buildInputs = - [ makeWrapper gawk readline libtool libunistring - libffi pkgconfig - ]; + buildNativeInputs = [ xz makeWrapper gawk pkgconfig ]; + buildInputs = [ readline libtool libunistring libffi ]; propagatedBuildInputs = [ gmp boehmgc ] # XXX: These ones aren't normally needed here, but since @@ -27,6 +24,11 @@ rec { # see below. ++ [ libtool libunistring ]; + # A native Guile 2.0 is needed to cross-build Guile. + selfBuildNativeInput = true; + + enableParallelBuilding = true; + patches = stdenv.lib.optionals (coverageAnalysis != null) [ ./gcov-file-name.patch ./disable-gc-sensitive-tests.patch ]; |