Merge pull request #42887 from matthewbauer/libsecurity-closure-reductions

Libsecurity closure reductions

pkgs/os-specific/darwin/apple-sdk/default.nix

@@ -160,8 +160,8 @@ in rec {
       installPhase = ''
         mkdir -p $out/include
         pushd $out/include >/dev/null
-        ln -s "${lib.getDev sdk}/include/xpc"
-        ln -s "${lib.getDev sdk}/include/launch.h"
+        cp -r "${lib.getDev sdk}/include/xpc" $out/include/xpc
+        cp "${lib.getDev sdk}/include/launch.h" $out/include/launch.h
         popd >/dev/null
       '';
     };

pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix

@@ -26,8 +26,9 @@ name: version: sha256: args: let
       '';
       preBuild = ''
         ln -s lib ${n}
-        makeFlagsArray=(-j''$NIX_BUILD_CORES)
+        makeFlagsArray=(-j$NIX_BUILD_CORES)
       '';
+      outputs = [ "out" "dev" ];
       buildInputs = [
         pkgs.gnustep.make
         pkgs.darwin.apple_sdk.frameworks.AppKit
@@ -51,6 +52,7 @@ name: version: sha256: args: let
         "-iframework ${pkgs.darwin.Security}/Library/Frameworks"
         "-I."
         "-Wno-deprecated-declarations"
+        "-DNDEBUG"
       ];
       NIX_LDFLAGS = with pkgs.darwin; with apple_sdk.frameworks; [
         "-L${libobjc}/lib"

pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix

@@ -9,7 +9,7 @@ appleDerivation {
     unpackFile ${libsecurity_cdsa_client.src}
     mv libsecurity_cdsa_client*/lib security_cdsa_client
     ln -s lib securityd_client
-    
+
     patch -p1 < ${./xdr-arity.patch}
   '';
   preBuild = ''
@@ -17,7 +17,7 @@ appleDerivation {
     cp derived_src/* lib
     rm lib/ucspClientC.c
   '';
-  postInstall = ''
-    ln -s ''$out/include/securityd ''$out/include/securityd_client
+  postFixup = ''
+    ln -s $dev/include/securityd $dev/include/securityd_client
   '';
 }

pkgs/os-specific/darwin/security-tool/default.nix

@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   '';
 
   preBuild = ''
-    makeFlagsArray=(-j''$NIX_BUILD_CORES)
+    makeFlagsArray=(-j$NIX_BUILD_CORES)
   '';
 
   NIX_LDFLAGS = "-no_dtrace_dof";