From 130a0cbde6feae6b51f35a007c78cc8a25a6c3c9 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 10 May 2018 12:16:29 -0400 Subject: [PATCH] guile: Remove old crossAttrs We fixed the linker issue with propagated dependencies. (cherry picked from commit 515ca1a7c8ca1c57b472826ae2b5dd2965b8b4bf) --- pkgs/development/interpreters/guile/2.0.nix | 9 --------- pkgs/development/interpreters/guile/default.nix | 9 --------- 2 files changed, 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/;