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

darwin: python35: add needed inputs

Browse Source
This commit is contained in:
Asko Soukka 2015-10-21 22:24:40 +03:00
parent 95eb3a2256
commit caafa68a7e
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.5/default.nix
View File

@ -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 = "14dywb94mci0kqbsji9riyyq8kx0h9ljdjjgxnkfrvm56hbammyn"; sha256 = "14dywb94mci0kqbsji9riyyq8kx0h9ljdjjgxnkfrvm56hbammyn";
@ -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

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

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