darwin: add needed inputs to python-3.4
This commit is contained in:
parent
c0a963e3cc
commit
a7f478a368
|
@ -12,6 +12,8 @@
|
||||||
, zlib
|
, zlib
|
||||||
, callPackage
|
, callPackage
|
||||||
, self
|
, self
|
||||||
|
|
||||||
|
, CF, configd
|
||||||
}:
|
}:
|
||||||
|
|
||||||
assert readline != null -> ncurses != null;
|
assert readline != null -> ncurses != null;
|
||||||
|
@ -33,6 +35,8 @@ stdenv.mkDerivation {
|
||||||
pythonVersion = majorVersion;
|
pythonVersion = majorVersion;
|
||||||
inherit majorVersion version;
|
inherit majorVersion version;
|
||||||
|
|
||||||
|
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CF configd ];
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz";
|
url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz";
|
||||||
sha256 = "1f4nm4z08sy0kqwisvv95l02crv6dyysdmx44p1mz3bn6csrdcxm";
|
sha256 = "1f4nm4z08sy0kqwisvv95l02crv6dyysdmx44p1mz3bn6csrdcxm";
|
||||||
|
@ -40,6 +44,10 @@ stdenv.mkDerivation {
|
||||||
|
|
||||||
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
|
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
|
||||||
|
|
||||||
|
prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||||
|
substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
|
||||||
|
'';
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
for i in /usr /sw /opt /pkg; do # improve purity
|
for i in /usr /sw /opt /pkg; do # improve purity
|
||||||
substituteInPlace ./setup.py --replace $i /no-such-path
|
substituteInPlace ./setup.py --replace $i /no-such-path
|
||||||
|
|
|
@ -5075,6 +5075,7 @@ let
|
||||||
self = python33;
|
self = python33;
|
||||||
};
|
};
|
||||||
python34 = hiPrio (callPackage ../development/interpreters/python/3.4 {
|
python34 = hiPrio (callPackage ../development/interpreters/python/3.4 {
|
||||||
|
inherit (darwin) CF configd;
|
||||||
self = python34;
|
self = python34;
|
||||||
});
|
});
|
||||||
python35 = hiPrio (callPackage ../development/interpreters/python/3.5 {
|
python35 = hiPrio (callPackage ../development/interpreters/python/3.5 {
|
||||||
|
|
Loading…
Reference in a new issue