summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2013-12-29 18:51:29 +0400
committerMichael Raskin <7c6f434c@mail.ru>2013-12-29 18:52:43 +0400
commitf1daf24bea2dafc157f11f00eec72baf1fb038c0 (patch)
tree04cac3ad6c2111c7c3ed7dd5e3cc941472e3e9df /pkgs/development
parente860eef8f3ea3c340cc4598f8f47bb6354f15fe6 (diff)
downloadnixpkgs-f1daf24bea2dafc157f11f00eec72baf1fb038c0.tar
nixpkgs-f1daf24bea2dafc157f11f00eec72baf1fb038c0.tar.gz
nixpkgs-f1daf24bea2dafc157f11f00eec72baf1fb038c0.tar.bz2
nixpkgs-f1daf24bea2dafc157f11f00eec72baf1fb038c0.tar.lz
nixpkgs-f1daf24bea2dafc157f11f00eec72baf1fb038c0.tar.xz
nixpkgs-f1daf24bea2dafc157f11f00eec72baf1fb038c0.tar.zst
nixpkgs-f1daf24bea2dafc157f11f00eec72baf1fb038c0.zip
Less aggressive LD_LIBRARY_PATH seems to avoid segfault
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/interpreters/pypy/2.2/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/pypy/2.2/default.nix b/pkgs/development/interpreters/pypy/2.2/default.nix
index 80ad4c70a10..b870522f629 100644
--- a/pkgs/development/interpreters/pypy/2.2/default.nix
+++ b/pkgs/development/interpreters/pypy/2.2/default.nix
@@ -26,7 +26,8 @@ let
 
     C_INCLUDE_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/include") buildInputs);
     LIBRARY_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
-    LD_LIBRARY_PATH = LIBRARY_PATH;
+    LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/lib") 
+      (stdenv.lib.filter (x : x.outPath != stdenv.gcc.libc.outPath or "") buildInputs));
 
     preConfigure = ''
       substituteInPlace Makefile \