Merge pull request #15477 from FRidh/pythonbuildinputs
Python: be explicit about buildInputs
This commit is contained in:
commit
022f5fdf83
@ -32,6 +32,8 @@ stdenv.mkDerivation {
|
||||
pythonVersion = majorVersion;
|
||||
inherit majorVersion version;
|
||||
|
||||
inherit buildInputs;
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";
|
||||
sha256 = "0gsxpgd5p4mwd01gw501vsyahncyw3h9836ypkr3y32kgazy89jj";
|
||||
|
@ -27,15 +27,27 @@ let
|
||||
fullVersion = "${version}";
|
||||
|
||||
buildInputs = filter (p: p != null) [
|
||||
zlib bzip2 lzma gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto
|
||||
];
|
||||
zlib
|
||||
bzip2
|
||||
lzma
|
||||
gdbm
|
||||
sqlite
|
||||
db
|
||||
readline
|
||||
ncurses
|
||||
openssl
|
||||
tcl
|
||||
tk
|
||||
libX11
|
||||
xproto
|
||||
] ++ optionals stdenv.isDarwin [ CF configd ];
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "python3-${fullVersion}";
|
||||
pythonVersion = majorVersion;
|
||||
inherit majorVersion version;
|
||||
|
||||
buildInputs = optionals stdenv.isDarwin [ CF configd ];
|
||||
inherit buildInputs;
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz";
|
||||
|
@ -27,15 +27,27 @@ let
|
||||
fullVersion = "${version}";
|
||||
|
||||
buildInputs = filter (p: p != null) [
|
||||
zlib bzip2 lzma gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto
|
||||
];
|
||||
zlib
|
||||
bzip2
|
||||
lzma
|
||||
gdbm
|
||||
sqlite
|
||||
db
|
||||
readline
|
||||
ncurses
|
||||
openssl
|
||||
tcl
|
||||
tk
|
||||
libX11
|
||||
xproto
|
||||
] ++ optionals stdenv.isDarwin [ CF configd ];
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "python3-${fullVersion}";
|
||||
pythonVersion = majorVersion;
|
||||
inherit majorVersion version;
|
||||
|
||||
buildInputs = optionals stdenv.isDarwin [ CF configd ];
|
||||
inherit buildInputs;
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz";
|
||||
|
Loading…
Reference in New Issue
Block a user