BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pypy: fix stdenv.lib removal

Browse source
This commit is contained in:
Domen Kozar 2013-07-23 23:24:51 +02:00
parent a0bed10ab5
commit e52fc8f431
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/development/interpreters/pypy/2.0/default.nix
View file

@ -35,18 +35,15 @@ let
''; '';
buildInputs = 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 ] [ bzip2 openssl pkgconfig pythonFull libffi ncurses ]
++ optional zlibSupport zlib; ++ stdenv.lib.optional zlibSupport zlib;
pypy = stdenv.mkDerivation rec { pypy = stdenv.mkDerivation rec {
name = "pypy-${version}"; name = "pypy-${version}";
inherit majorVersion version src buildInputs; inherit majorVersion version src buildInputs;
C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
preConfigure = '' preConfigure = ''
substituteInPlace Makefile \ substituteInPlace Makefile \
--replace "-Ojit" "-Ojit --batch" \ --replace "-Ojit" "-Ojit --batch" \
@ -86,4 +83,4 @@ let
}; };
}; };
in pypy // { inherit modules; } in pypy