mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-11 04:02:55 +03:00
Merge pull request #81300 from emilazy/fix-pypy-openssl
pypy{,3}: use openssl_1_1
This commit is contained in:
commit
d9448513a5
@ -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) [
|
||||
|
Loading…
Reference in New Issue
Block a user