diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-07-21 11:05:58 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-07-21 11:05:58 +0200 |
| commit | a13802b2c8568426a6d31ab08aaaf2965010a6ce (patch) | |
| tree | d3bbadb2a5cae436931440b754b96c3ced2771be /pkgs/development/interpreters/guile | |
| parent | 15f6dcb668dcb6b4bfe33f47091273f978dcc0bf (diff) | |
| parent | 581637ba5a512e1179cdaf0108931fca32892b32 (diff) | |
| download | nixpkgs-a13802b2c8568426a6d31ab08aaaf2965010a6ce.tar nixpkgs-a13802b2c8568426a6d31ab08aaaf2965010a6ce.tar.gz nixpkgs-a13802b2c8568426a6d31ab08aaaf2965010a6ce.tar.bz2 nixpkgs-a13802b2c8568426a6d31ab08aaaf2965010a6ce.tar.lz nixpkgs-a13802b2c8568426a6d31ab08aaaf2965010a6ce.tar.xz nixpkgs-a13802b2c8568426a6d31ab08aaaf2965010a6ce.tar.zst nixpkgs-a13802b2c8568426a6d31ab08aaaf2965010a6ce.zip | |
Merge remote-tracking branch 'origin/master' into gcc-6
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 769c1951a3c..fe9f94beed1 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 |