diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2018-05-10 12:34:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-10 12:34:45 -0400 |
| commit | 5b4b24bfa022b3bdeb10c39e25ec7725f7486914 (patch) | |
| tree | a09c7c47ee9166f08e0d683cedbbea45688ec544 | |
| parent | 1463480edbf6757140b3764dcec2fa720978add6 (diff) | |
| parent | 515ca1a7c8ca1c57b472826ae2b5dd2965b8b4bf (diff) | |
| download | nixlib-5b4b24bfa022b3bdeb10c39e25ec7725f7486914.tar nixlib-5b4b24bfa022b3bdeb10c39e25ec7725f7486914.tar.gz nixlib-5b4b24bfa022b3bdeb10c39e25ec7725f7486914.tar.bz2 nixlib-5b4b24bfa022b3bdeb10c39e25ec7725f7486914.tar.lz nixlib-5b4b24bfa022b3bdeb10c39e25ec7725f7486914.tar.xz nixlib-5b4b24bfa022b3bdeb10c39e25ec7725f7486914.tar.zst nixlib-5b4b24bfa022b3bdeb10c39e25ec7725f7486914.zip | |
Merge pull request #40290 from obsidiansystems/fewer-crossAttrs
guile: Remove old crossAttrs
| -rw-r--r-- | pkgs/development/interpreters/guile/2.0.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/interpreters/guile/default.nix | 9 |
2 files changed, 0 insertions, 18 deletions
diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix index 2c9aec5b6952..3a11dc78c6cb 100644 --- a/pkgs/development/interpreters/guile/2.0.nix +++ b/pkgs/development/interpreters/guile/2.0.nix @@ -92,15 +92,6 @@ setupHook = ./setup-hook-2.0.sh; - crossAttrs.preConfigure = - 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 - # passed. So it needs some help (XXX). - "export LDFLAGS=-Wl,-rpath-link=${gnu.libpthreadCross}/lib"; - - meta = { description = "Embeddable Scheme implementation"; homepage = http://www.gnu.org/software/guile/; diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 3d5c51dc420b..748b3c5e200a 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -88,15 +88,6 @@ setupHook = ./setup-hook-2.2.sh; - crossAttrs.preConfigure = - 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 - # passed. So it needs some help (XXX). - "export LDFLAGS=-Wl,-rpath-link=${gnu.libpthreadCross}/lib"; - - meta = { description = "Embeddable Scheme implementation"; homepage = http://www.gnu.org/software/guile/; |