From 907d7518d8d86a81fd2f7c6b85343c29ce6acde4 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 2 Jul 2018 17:49:24 -0400 Subject: darwin.libsecurity: switch to multiple outputs --- .../darwin/apple-source-releases/libsecurity_generic/default.nix | 1 + .../darwin/apple-source-releases/libsecurityd/default.nix | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs/os-specific/darwin') diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix index e8d0261becad..25e967bd2d3c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix @@ -28,6 +28,7 @@ name: version: sha256: args: let ln -s lib ${n} makeFlagsArray=(-j$NIX_BUILD_CORES) ''; + outputs = [ "out" "dev" ]; buildInputs = [ pkgs.gnustep.make pkgs.darwin.apple_sdk.frameworks.AppKit diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix index 48bb80eb7511..fb3441f70507 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix +++ b/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 ''; } -- cgit 1.4.1