JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

darwin: add needed inputs to python-3.4

Browse Source
This commit is contained in:
Jude Taylor 2015-10-20 15:53:21 -07:00
parent c0a963e3cc
commit a7f478a368
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/interpreters/python/3.4/default.nix
View File

@ -12,6 +12,8 @@
, zlib
, callPackage
, self
, CF, configd
}:
assert readline != null -> ncurses != null;
@ -33,6 +35,8 @@ stdenv.mkDerivation {
pythonVersion = majorVersion;
inherit majorVersion version;
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CF configd ];
src = fetchurl {
url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz";
sha256 = "1f4nm4z08sy0kqwisvv95l02crv6dyysdmx44p1mz3bn6csrdcxm";
@ -40,6 +44,10 @@ stdenv.mkDerivation {
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
'';
preConfigure = ''
for i in /usr /sw /opt /pkg; do # improve purity
substituteInPlace ./setup.py --replace $i /no-such-path

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

@ -5075,6 +5075,7 @@ let
self = python33;
};
python34 = hiPrio (callPackage ../development/interpreters/python/3.4 {
inherit (darwin) CF configd;
self = python34;
});
python35 = hiPrio (callPackage ../development/interpreters/python/3.5 {