darwin-frameworks: use the system CF when frameworks are used

This will get propagated down to other libraries loaded because everything in nixpkgs references CF based on an rpath entry.
NixOS · Jul 26, 2017 · 76d8586 · 76d8586
1 parent bf9279d
commit 76d8586
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix
@@ -134,7 +134,7 @@ let
     propagatedBuildInputs = deps;
 
     # don't use pure CF for dylibs that depend on frameworks
-    setupHook = ../../../build-support/setup-hooks/fix-darwin-frameworks.sh;
+    setupHook = ./framework-setup-hook.sh;
 
     # allows building the symlink tree
     __impureHostDeps = [ "/System/Library/Frameworks/${name}.framework" ];

diff --git a/pkgs/os-specific/darwin/apple-sdk/framework-setup-hook.sh b/pkgs/os-specific/darwin/apple-sdk/framework-setup-hook.sh
@@ -0,0 +1,5 @@
+useSystemCoreFoundationFramework () {
+  export NIX_COREFOUNDATION_RPATH=/System/Library/Frameworks
+}
+
+envHooks+=(useSystemCoreFoundationFramework)