diff options
author | toonn <toonn@toonn.io> | 2021-04-13 20:54:01 +0200 |
---|---|---|
committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-11-24 15:17:13 -0800 |
commit | e07eef85e85f359be86f9f1b3f09c642b641fdbb (patch) | |
tree | 5f695672f2429ac878993e625cfd02c9da4b74d0 /pkgs | |
parent | 7e4880c21b0be51f412dd27cda9bc8e3f28ec111 (diff) | |
download | nixpkgs-e07eef85e85f359be86f9f1b3f09c642b641fdbb.tar nixpkgs-e07eef85e85f359be86f9f1b3f09c642b641fdbb.tar.gz nixpkgs-e07eef85e85f359be86f9f1b3f09c642b641fdbb.tar.bz2 nixpkgs-e07eef85e85f359be86f9f1b3f09c642b641fdbb.tar.lz nixpkgs-e07eef85e85f359be86f9f1b3f09c642b641fdbb.tar.xz nixpkgs-e07eef85e85f359be86f9f1b3f09c642b641fdbb.tar.zst nixpkgs-e07eef85e85f359be86f9f1b3f09c642b641fdbb.zip |
xnu: Fix python3 patch
This reverts 7da313e10a2b73b05f27a2f6bfeafa1c1d37ce8b because it's no longer necessary.
Diffstat (limited to 'pkgs')
-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__ |