diff options
| author | Domen Kozar <domen@dev.si> | 2013-07-23 23:24:51 +0200 |
|---|---|---|
| committer | Domen Kozar <domen@dev.si> | 2013-07-23 23:24:51 +0200 |
| commit | e52fc8f431ea0542a34b376e1e63a96681702d80 (patch) | |
| tree | c59654e52474286867a1ec0eba6e32adb8e0d705 /pkgs/development/interpreters/pypy/2.0/default.nix | |
| parent | a0bed10ab53da57bd713de11034442bab526441b (diff) | |
| download | nixpkgs-e52fc8f431ea0542a34b376e1e63a96681702d80.tar nixpkgs-e52fc8f431ea0542a34b376e1e63a96681702d80.tar.gz nixpkgs-e52fc8f431ea0542a34b376e1e63a96681702d80.tar.bz2 nixpkgs-e52fc8f431ea0542a34b376e1e63a96681702d80.tar.lz nixpkgs-e52fc8f431ea0542a34b376e1e63a96681702d80.tar.xz nixpkgs-e52fc8f431ea0542a34b376e1e63a96681702d80.tar.zst nixpkgs-e52fc8f431ea0542a34b376e1e63a96681702d80.zip | |
pypy: fix stdenv.lib removal
Diffstat (limited to 'pkgs/development/interpreters/pypy/2.0/default.nix')
| -rw-r--r-- | pkgs/development/interpreters/pypy/2.0/default.nix | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/development/interpreters/pypy/2.0/default.nix b/pkgs/development/interpreters/pypy/2.0/default.nix index f689ef9db21..711c27fabf2 100644 --- a/pkgs/development/interpreters/pypy/2.0/default.nix +++ b/pkgs/development/interpreters/pypy/2.0/default.nix @@ -35,18 +35,15 @@ let ''; buildInputs = - optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ + stdenv.lib.optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ [ bzip2 openssl pkgconfig pythonFull libffi ncurses ] - ++ optional zlibSupport zlib; + ++ stdenv.lib.optional zlibSupport zlib; pypy = stdenv.mkDerivation rec { name = "pypy-${version}"; inherit majorVersion version src buildInputs; - C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); - LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs); - preConfigure = '' substituteInPlace Makefile \ --replace "-Ojit" "-Ojit --batch" \ @@ -86,4 +83,4 @@ let }; }; -in pypy // { inherit modules; } +in pypy |