diff options
| author | Jude Taylor <me@jude.bio> | 2015-10-20 15:53:21 -0700 |
|---|---|---|
| committer | Jude Taylor <me@jude.bio> | 2015-10-20 15:54:33 -0700 |
| commit | a7f478a3685248ff4238991c8fededa63227d6af (patch) | |
| tree | 3ad34c0c5d8e39a807da1b1924593ce6554fae48 /pkgs | |
| parent | c0a963e3cc6bd9c049f6db198a6acf92ee795e4e (diff) | |
| download | nixlib-a7f478a3685248ff4238991c8fededa63227d6af.tar nixlib-a7f478a3685248ff4238991c8fededa63227d6af.tar.gz nixlib-a7f478a3685248ff4238991c8fededa63227d6af.tar.bz2 nixlib-a7f478a3685248ff4238991c8fededa63227d6af.tar.lz nixlib-a7f478a3685248ff4238991c8fededa63227d6af.tar.xz nixlib-a7f478a3685248ff4238991c8fededa63227d6af.tar.zst nixlib-a7f478a3685248ff4238991c8fededa63227d6af.zip | |
darwin: add needed inputs to python-3.4
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/interpreters/python/3.4/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix index 10bb8b3215df..570c7cc35d13 100644 --- a/pkgs/development/interpreters/python/3.4/default.nix +++ b/pkgs/development/interpreters/python/3.4/default.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc78dac5ee79..4cd7a30d030d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { |