diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-12-05 11:11:51 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-12-05 11:11:51 +0100 |
commit | 263fd55d4b2d9c17dac87ee7a7a39c951aee1b86 (patch) | |
tree | 50c30ebb0626be0b3333d90202081e8697a85abf /pkgs/development/interpreters/python | |
parent | b1dca6ca881e3e5864c60a2ef206579ce4d718b1 (diff) | |
parent | c20b6846f2ec4b1fe70d62fe99d165476aed65d0 (diff) | |
download | nixlib-263fd55d4b2d9c17dac87ee7a7a39c951aee1b86.tar nixlib-263fd55d4b2d9c17dac87ee7a7a39c951aee1b86.tar.gz nixlib-263fd55d4b2d9c17dac87ee7a7a39c951aee1b86.tar.bz2 nixlib-263fd55d4b2d9c17dac87ee7a7a39c951aee1b86.tar.lz nixlib-263fd55d4b2d9c17dac87ee7a7a39c951aee1b86.tar.xz nixlib-263fd55d4b2d9c17dac87ee7a7a39c951aee1b86.tar.zst nixlib-263fd55d4b2d9c17dac87ee7a7a39c951aee1b86.zip |
Merge recent staging built on Hydra
http://hydra.nixos.org/eval/1231884 Only Darwin jobs seem to be queued now, but we can't afford to wait for that single build slave.
Diffstat (limited to 'pkgs/development/interpreters/python')
-rw-r--r-- | pkgs/development/interpreters/python/2.7/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index e08fde3c8bfc..f624bd5d85e2 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -97,7 +97,9 @@ let ] ++ optionals x11Support [ tcl tk xlibsWrapper libX11 ] ) ++ optional zlibSupport zlib - ++ optionals stdenv.isDarwin [ CF configd ]; + ++ optional stdenv.isDarwin CF; + + propagatedBuildInputs = optional stdenv.isDarwin configd; # Build the basic Python interpreter without modules that have # external dependencies. @@ -105,8 +107,8 @@ let name = "python-${version}"; pythonVersion = majorVersion; - inherit majorVersion version src patches buildInputs preConfigure - configureFlags; + inherit majorVersion version src patches buildInputs propagatedBuildInputs + preConfigure configureFlags; LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); |