diff options
author | Jude Taylor <me@jude.bio> | 2015-10-28 12:14:42 -0700 |
---|---|---|
committer | Jude Taylor <me@jude.bio> | 2015-10-28 13:34:53 -0700 |
commit | c62cf0b5b3774afb361ae22f154e54fdb572c084 (patch) | |
tree | d7e247f21b65a0af18d699cb6aa280f0ada5e282 /pkgs/os-specific/darwin/apple-sdk/default.nix | |
parent | 1786f6bd4dd9821fad417402f9289021ee0f67ec (diff) | |
download | nixlib-c62cf0b5b3774afb361ae22f154e54fdb572c084.tar nixlib-c62cf0b5b3774afb361ae22f154e54fdb572c084.tar.gz nixlib-c62cf0b5b3774afb361ae22f154e54fdb572c084.tar.bz2 nixlib-c62cf0b5b3774afb361ae22f154e54fdb572c084.tar.lz nixlib-c62cf0b5b3774afb361ae22f154e54fdb572c084.tar.xz nixlib-c62cf0b5b3774afb361ae22f154e54fdb572c084.tar.zst nixlib-c62cf0b5b3774afb361ae22f154e54fdb572c084.zip |
add propagated builds where needed to darwin frameworks
Diffstat (limited to 'pkgs/os-specific/darwin/apple-sdk/default.nix')
-rw-r--r-- | pkgs/os-specific/darwin/apple-sdk/default.nix | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index ea899b6abcfc..24083060e546 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xar, gzip, cpio, CF, pkgs }: +{ stdenv, fetchurl, xar, gzip, cpio, pkgs }: let # sadly needs to be exported because security_tool needs it @@ -126,7 +126,7 @@ in rec { __propagatedImpureHostDeps = [ "/usr/lib/libXplugin.1.dylib" ]; propagatedBuildInputs = with frameworks; [ - OpenGL ApplicationServices Carbon IOKit CF CoreGraphics CoreServices CoreText + OpenGL ApplicationServices Carbon IOKit pkgs.darwin.CF CoreGraphics CoreServices CoreText ]; installPhase = '' @@ -158,9 +158,16 @@ in rec { --replace "QuartzCore/../Frameworks/CoreImage.framework/Headers" "CoreImage" ''; }); + + Security = stdenv.lib.overrideDerivation super.Security (drv: { + setupHook = ./security-setup-hook.sh; + }); }; - bareFrameworks = stdenv.lib.mapAttrs framework (import ./frameworks.nix { inherit frameworks libs CF; }); + bareFrameworks = stdenv.lib.mapAttrs framework (import ./frameworks.nix { + inherit frameworks libs; + inherit (pkgs.darwin) CF cf-private libobjc; + }); frameworks = bareFrameworks // overrides bareFrameworks; |