diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-26 19:06:36 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-28 18:21:05 -0400 |
| commit | c3c5793ab29d3fe8b3c0faff2ad644cfe91618b9 (patch) | |
| tree | 59c52137366439a371f7127535d049a1611194d7 /pkgs/development/interpreters/guile | |
| parent | deb8fae4c0b65f0b70642518a221db54058d2cac (diff) | |
| download | nixpkgs-c3c5793ab29d3fe8b3c0faff2ad644cfe91618b9.tar nixpkgs-c3c5793ab29d3fe8b3c0faff2ad644cfe91618b9.tar.gz nixpkgs-c3c5793ab29d3fe8b3c0faff2ad644cfe91618b9.tar.bz2 nixpkgs-c3c5793ab29d3fe8b3c0faff2ad644cfe91618b9.tar.lz nixpkgs-c3c5793ab29d3fe8b3c0faff2ad644cfe91618b9.tar.xz nixpkgs-c3c5793ab29d3fe8b3c0faff2ad644cfe91618b9.tar.zst nixpkgs-c3c5793ab29d3fe8b3c0faff2ad644cfe91618b9.zip | |
guile: Don't use stdenv.cross
Diffstat (limited to 'pkgs/development/interpreters/guile')
| -rw-r--r-- | pkgs/development/interpreters/guile/2.0.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/interpreters/guile/default.nix | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix index 04f31dda26a..5746300fca0 100644 --- a/pkgs/development/interpreters/guile/2.0.nix +++ b/pkgs/development/interpreters/guile/2.0.nix @@ -1,5 +1,7 @@ { fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring -, libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null }: +, libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null +, hostPlatform +}: # Do either a coverage analysis build or a standard build. (if coverageAnalysis != null @@ -84,7 +86,7 @@ setupHook = ./setup-hook-2.0.sh; crossAttrs.preConfigure = - stdenv.lib.optionalString (stdenv.cross.config == "i586-pc-gnu") + stdenv.lib.optionalString (hostPlatform.isHurd) # On GNU, libgc depends on libpthread, but the cross linker doesn't # know where to find libpthread, which leads to erroneous test failures # in `configure', where `-pthread' and `-lpthread' aren't explicitly diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 8a2deeddff6..19217476b14 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -1,5 +1,7 @@ { fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring -, libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null }: +, libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null +, hostPlatform +}: # Do either a coverage analysis build or a standard build. (if coverageAnalysis != null @@ -80,7 +82,7 @@ setupHook = ./setup-hook-2.2.sh; crossAttrs.preConfigure = - stdenv.lib.optionalString (stdenv.cross.config == "i586-pc-gnu") + stdenv.lib.optionalString (hostPlatform.isHurd) # On GNU, libgc depends on libpthread, but the cross linker doesn't # know where to find libpthread, which leads to erroneous test failures # in `configure', where `-pthread' and `-lpthread' aren't explicitly |