diff options
author | Jude Taylor <me@jude.bio> | 2015-11-21 12:06:41 -0800 |
---|---|---|
committer | Jude Taylor <me@jude.bio> | 2015-11-21 12:10:33 -0800 |
commit | 69e7f3bb7405ad4bf81e6d8c1897116c3a4d77dc (patch) | |
tree | 9ee0d5cf9773d1aef508c118eaec64fe89e62e3b /pkgs/os-specific/darwin/apple-sdk/default.nix | |
parent | a63346e33ca05f691e6854b896eac5cef99b4ef8 (diff) | |
download | nixpkgs-69e7f3bb7405ad4bf81e6d8c1897116c3a4d77dc.tar nixpkgs-69e7f3bb7405ad4bf81e6d8c1897116c3a4d77dc.tar.gz nixpkgs-69e7f3bb7405ad4bf81e6d8c1897116c3a4d77dc.tar.bz2 nixpkgs-69e7f3bb7405ad4bf81e6d8c1897116c3a4d77dc.tar.lz nixpkgs-69e7f3bb7405ad4bf81e6d8c1897116c3a4d77dc.tar.xz nixpkgs-69e7f3bb7405ad4bf81e6d8c1897116c3a4d77dc.tar.zst nixpkgs-69e7f3bb7405ad4bf81e6d8c1897116c3a4d77dc.zip |
switch to zero underscores for sandbox profiles; remove generateFrameworkProfile
Diffstat (limited to 'pkgs/os-specific/darwin/apple-sdk/default.nix')
-rw-r--r-- | pkgs/os-specific/darwin/apple-sdk/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index a422bfa6452..f1e3556273e 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl, xar, gzip, cpio, pkgs }: let - generateFrameworkProfile = pkgs.callPackage ./generate-framework-profile.nix {}; # sadly needs to be exported because security_tool needs it sdk = stdenv.mkDerivation rec { version = "10.9"; @@ -97,11 +96,11 @@ let propagatedBuildInputs = deps; # allows building the symlink tree - _sandboxProfile = '' + sandboxProfile = '' (allow file-read* (subpath "/System/Library/Frameworks/${name}.framework")) ''; - _propagatedSandboxProfile = stdenv.lib.sandbox.importProfile (generateFrameworkProfile name); + __propagatedImpureHostDeps = "/System/Library/Frameworks/${name}.framework/${name}"; meta = with stdenv.lib; { description = "Apple SDK framework ${name}"; @@ -165,7 +164,7 @@ in rec { }); CoreServices = stdenv.lib.overrideDerivation super.CoreServices (drv: { - _propagatedSandboxProfile = drv._propagatedSandboxProfile ++ ['' + __propagatedSandboxProfile = drv.__propagatedSandboxProfile ++ ['' (allow mach-lookup (global-name "com.apple.CoreServices.coreservicesd")) '']; }); @@ -182,5 +181,5 @@ in rec { frameworks = bareFrameworks // overrides bareFrameworks; - inherit sdk generateFrameworkProfile; + inherit sdk; } |