diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-10 09:21:25 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-12 23:57:48 +0100 |
| commit | f8472457a440de3c44f6f604142d678b6ae2a762 (patch) | |
| tree | 68eaaa782765062ec7071c37c847b51ade8b2ee2 | |
| parent | 4858f3307e47f94e6e7f3a4dfcbae1f5d5b746a5 (diff) | |
| download | nixlib-f8472457a440de3c44f6f604142d678b6ae2a762.tar nixlib-f8472457a440de3c44f6f604142d678b6ae2a762.tar.gz nixlib-f8472457a440de3c44f6f604142d678b6ae2a762.tar.bz2 nixlib-f8472457a440de3c44f6f604142d678b6ae2a762.tar.lz nixlib-f8472457a440de3c44f6f604142d678b6ae2a762.tar.xz nixlib-f8472457a440de3c44f6f604142d678b6ae2a762.tar.zst nixlib-f8472457a440de3c44f6f604142d678b6ae2a762.zip | |
pypy: fix build with multiple outputs
| -rw-r--r-- | pkgs/development/interpreters/pypy/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix index 2b74aaa94415..b0410681a511 100644 --- a/pkgs/development/interpreters/pypy/default.nix +++ b/pkgs/development/interpreters/pypy/default.nix @@ -25,9 +25,9 @@ let ++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ stdenv.lib.optional zlibSupport zlib; - C_INCLUDE_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/include") buildInputs); - LIBRARY_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/lib") buildInputs); - LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/lib") + C_INCLUDE_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p.dev or p}/include") buildInputs); + LIBRARY_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p.lib or p.out or p}/lib") buildInputs); + LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p.lib or p.out or p}/lib") (stdenv.lib.filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs)); preConfigure = '' |