From d000198ab7f845406e055bdfd4d4ce4f76aca890 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 12 May 2018 10:02:30 -0500 Subject: [PATCH] darwin.architecture: correctly install headers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I’m not going to fix all of them but this is the best way to do this in Apple things. Just add ‘EXPORT_DSTDIR’ to the installFlags & set ‘DSTDIR’ to $(out). Please do this instead of the patching! --- .../apple-source-releases/architecture/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) 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 8b3eb2017e27..4a155a4c403a 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix @@ -3,17 +3,9 @@ appleDerivation { dontBuild = true; - postPatch = '' - substituteInPlace $sourceRoot/Makefile \ - --replace "/usr/include" "/include" \ - --replace "/usr/bin/" "" \ - --replace "/bin/" "" - ''; + installFlags = [ "EXPORT_DSTDIR=/include/architecture" ]; - installPhase = '' - export DSTROOT=$out - make install - ''; + DSTROOT = "$(out)"; meta = with stdenv.lib; { maintainers = with maintainers; [ copumpkin ];