ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-02 17:09:09 +03:00
Code Issues Projects Releases Wiki Activity

pypy: fix build

Browse Source
This commit is contained in:
Frederik Rietdijk 2016-10-18 23:12:03 +02:00
parent 9b27c09465
commit 2081a69092
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/interpreters/python/pypy/2.7/default.nix
View File

@ -34,7 +34,7 @@ let
patch lib-python/2.7/test/test_pyexpat.py < '${expatch}' patch lib-python/2.7/test/test_pyexpat.py < '${expatch}'
''; '';
buildInputs = [ bzip2 openssl pkgconfig python python.tkinter libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 makeWrapper gdbm db ] buildInputs = [ bzip2 openssl pkgconfig python libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 makeWrapper gdbm db ]
++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc
++ stdenv.lib.optional zlibSupport zlib; ++ stdenv.lib.optional zlibSupport zlib;

1
pkgs/top-level/all-packages.nix
View File

@ -5528,6 +5528,7 @@ in
pypy27 = callPackage ../development/interpreters/python/pypy/2.7 { pypy27 = callPackage ../development/interpreters/python/pypy/2.7 {
self = pypy27; self = pypy27;
python = python27.override{x11Support=true;};
}; };
python2nix = callPackage ../tools/package-management/python2nix { }; python2nix = callPackage ../tools/package-management/python2nix { };