diff options
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/xnu/python3.patch | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/darwin/make-bootstrap-tools.nix | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/python3.patch b/pkgs/os-specific/darwin/apple-source-releases/xnu/python3.patch index 10778406c8e..9f29376187f 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/xnu/python3.patch +++ b/pkgs/os-specific/darwin/apple-source-releases/xnu/python3.patch @@ -18,7 +18,7 @@ index 73b2db4..d354ba0 100755 - m = id_name_pattern.match(line) - if m: + m = id_name_pattern.match(line) -+ if m: ++ if m: code_table += [(int(m.group(1),base=16), m.group(2))] # emit typedef: diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 434eadb38bf..536bf251a94 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -33,10 +33,7 @@ in rec { curl_ = curlMinimal.override (args: { gssSupport = false; http2Support = false; }); # Avoid stdenv rebuild. - Libsystem_ = (darwin.Libsystem.override (args: - { xnu = darwin.xnu.overrideAttrs (oldAttrs: - { patches = [ ./fixed-xnu-python3.patch ]; }); - })).overrideAttrs (oldAttrs: + Libsystem_ = darwin.Libsystem.overrideAttrs (oldAttrs: { installPhase = oldAttrs.installPhase + '' cat <<EOF > $out/include/TargetConditionals.h #ifndef __TARGETCONDITIONALS__ |