diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-05-06 16:07:55 -0500 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-05-06 16:07:55 -0500 |
commit | 9811bf225876f0200a10e360800dd081d60253ec (patch) | |
tree | c97079d951fa5d3cad3466eada5336c8f7fd2f98 /pkgs/os-specific | |
parent | 295815bec71ccee51cbc35582e7300df00c7fd6b (diff) | |
download | nixlib-9811bf225876f0200a10e360800dd081d60253ec.tar nixlib-9811bf225876f0200a10e360800dd081d60253ec.tar.gz nixlib-9811bf225876f0200a10e360800dd081d60253ec.tar.bz2 nixlib-9811bf225876f0200a10e360800dd081d60253ec.tar.lz nixlib-9811bf225876f0200a10e360800dd081d60253ec.tar.xz nixlib-9811bf225876f0200a10e360800dd081d60253ec.tar.zst nixlib-9811bf225876f0200a10e360800dd081d60253ec.zip |
treewide: cleanup phases from last commit
The last commit broken Darwin stdenv. We still need to skip some phases when Apple provides a Makefile that shouldn’t be used.
Diffstat (limited to 'pkgs/os-specific')
5 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix index 648770660d3d..5c6d54aeb9c3 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix @@ -1,6 +1,8 @@ { stdenv, appleDerivation }: appleDerivation { + dontBuild = true; + installPhase = '' mkdir -p $out/include cp MacTypes.h $out/include diff --git a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix index 2638a0afb76d..07c36ebfe120 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix @@ -1,12 +1,7 @@ { stdenv, appleDerivation }: appleDerivation { - postPatch = '' - substituteInPlace $sourceRoot/Makefile \ - --replace "/usr/include" "/include" \ - --replace "/usr/bin/" "" \ - --replace "/bin/" "" - ''; + dontBuild = true; installPhase = '' export DSTROOT=$out diff --git a/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix b/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix index bbc8c5e5e81d..37dffaa9b20e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix @@ -1,6 +1,7 @@ { stdenv, appleDerivation }: appleDerivation { + dontBuild = true; installPhase = '' mkdir -p $out/include/ cp copyfile.h $out/include/ diff --git a/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix b/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix index c8a40a20c9d3..80d629dfa3e6 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix @@ -1,6 +1,7 @@ { stdenv, appleDerivation }: appleDerivation { + dontBuild = true; installPhase = '' mkdir -p $out/Library/Frameworks/EAP8021X.framework/Headers diff --git a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix index 44c50e468384..a43c00f7691b 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix @@ -1,6 +1,8 @@ { stdenv, appleDerivation }: appleDerivation { + dontConfigure = true; + dontBuild = true; installPhase = '' mkdir -p $out/include/dispatch $out/include/os |