diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-29 15:29:11 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-29 15:29:11 +0100 |
| commit | 79217339d26ff51ccacf10967de700d785f088e5 (patch) | |
| tree | a3fd63289448ed29c4ce387fa883e57f8ce55273 /pkgs/development/interpreters/python | |
| parent | bb701376cf3d7d1ffe65b31dc6a1c46dd80a673b (diff) | |
| parent | cf6477076b4ea05e9dcf1e6dda565604076ec6d8 (diff) | |
| download | nixlib-79217339d26ff51ccacf10967de700d785f088e5.tar nixlib-79217339d26ff51ccacf10967de700d785f088e5.tar.gz nixlib-79217339d26ff51ccacf10967de700d785f088e5.tar.bz2 nixlib-79217339d26ff51ccacf10967de700d785f088e5.tar.lz nixlib-79217339d26ff51ccacf10967de700d785f088e5.tar.xz nixlib-79217339d26ff51ccacf10967de700d785f088e5.tar.zst nixlib-79217339d26ff51ccacf10967de700d785f088e5.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/interpreters/python')
| -rw-r--r-- | pkgs/development/interpreters/python/pypy/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index 0c4f3eda7b1e..54400ae3e0a4 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -1,6 +1,6 @@ { stdenv, substituteAll, fetchurl , zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi, libunwind, Security -, sqlite, openssl_1_0_2, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11 +, sqlite, openssl, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11 , self, gdbm, db, lzma , python-setup-hook # For the Python package set @@ -40,7 +40,7 @@ in with passthru; stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - bzip2 openssl_1_0_2 pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 gdbm db + bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 gdbm db ] ++ optionals isPy3k [ lzma ] ++ optionals (stdenv ? cc && stdenv.cc.libc != null) [ |