diff options
Diffstat (limited to 'pkgs/development/interpreters/guile/default.nix')
| -rw-r--r-- | pkgs/development/interpreters/guile/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index e5c8f2685480..d09e995e95c0 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -14,7 +14,7 @@ sha256 = "0f53pxkia4v17n0avwqlcjpy0n89hkazm2xsa6p84lv8k6k8y9vg"; }; - buildNativeInputs = [ makeWrapper gawk pkgconfig ]; + nativeBuildInputs = [ makeWrapper gawk pkgconfig ]; buildInputs = [ readline libtool libunistring libffi ]; propagatedBuildInputs = [ gmp boehmgc ] @@ -25,13 +25,17 @@ ++ [ libtool libunistring ]; # A native Guile 2.0 is needed to cross-build Guile. - selfBuildNativeInput = true; + selfNativeBuildInput = true; enableParallelBuilding = true; patches = [ ./disable-gc-sensitive-tests.patch ] ++ (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch); + # Explicitly link against libgcc_s, to work around the infamous + # "libgcc_s.so.1 must be installed for pthread_cancel to work". + LDFLAGS = "-lgcc_s"; + postInstall = '' wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin" |