diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-05-31 13:15:05 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-05-31 13:17:08 +0200 |
| commit | 7848422d71f000dbb6e0cfd594b7afb9d5281ace (patch) | |
| tree | 9faee296e9151bd29686693219ab88f8b5ab8c49 | |
| parent | Merge pull request #26241 from womfoo/bump/gpxsee-3.8 (diff) | |
| download | nixpkgs-7848422d71f000dbb6e0cfd594b7afb9d5281ace.tar.gz | |
xnu: Depend on python
Before, it used /usr/bin/python, which breaks when sandboxing is enabled.
| -rw-r--r-- | pkgs/development/interpreters/python/cpython/2.7/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/stdenv/darwin/default.nix | 8 |
3 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index c5fa05651bbe..f74c03e5fe3c 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -128,7 +128,7 @@ let ++ optionals stdenv.isCygwin [ expat libffi ] ++ [ db gdbm ncurses sqlite readline ] ++ optionals x11Support [ tcl tk xlibsWrapper libX11 ] - ++ optionals stdenv.isDarwin [ CF configd ]; + ++ optionals (stdenv.isDarwin && CF != null) [ CF configd ]; mkPaths = paths: { C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" paths; diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix index 0ce9c54e48c4..2c7da5be6e4c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix @@ -1,9 +1,9 @@ -{ stdenv, appleDerivation, fetchzip, bootstrap_cmds, bison, flex, gnum4, unifdef, perl }: +{ stdenv, appleDerivation, fetchzip, bootstrap_cmds, bison, flex, gnum4, unifdef, perl, python }: appleDerivation { phases = [ "unpackPhase" "patchPhase" "installPhase" ]; - buildInputs = [ bootstrap_cmds bison flex gnum4 unifdef perl ]; + buildInputs = [ bootstrap_cmds bison flex gnum4 unifdef perl python ]; patchPhase = '' substituteInPlace Makefile \ diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index b9592014b46b..eb84482ed7d3 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -151,7 +151,13 @@ in rec { extraBuildInputs = []; }; - persistent0 = _: _: _: {}; + persistent0 = _: self: super: { + # Python is needed to build xnu. + python = super.python.override { + # Break a circular dependency. + CF = null; configd = null; + }; + }; stage1 = prevStage: with prevStage; stageFun 1 prevStage { extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\""; |