From 92652b4d79cf09705c011dbf1c38bc871a4011c8 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Fri, 21 Jul 2017 20:29:18 +0200
Subject: [PATCH] darwin-CF: use @rpath for library id and add an rpath entry
for CF based on NIX_COREFOUNDATION_RPATH
---
pkgs/build-support/cc-wrapper/ld-wrapper.sh | 4 ++++
pkgs/os-specific/darwin/apple-source-releases/CF/default.nix | 2 +-
pkgs/stdenv/darwin/default.nix | 1 +
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
index a775b6da823..38712665e43 100644
--- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
@@ -145,6 +145,10 @@ if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ]; then
fi
done
done
+
+ if [ -n "${NIX_COREFOUNDATION_RPATH:-}" ]; then
+ extraAfter+=(-rpath $NIX_COREFOUNDATION_RPATH)
+ fi
fi
diff --git a/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix
index e44966aa84d..5589d1592f4 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix
@@ -18,7 +18,7 @@ appleDerivation {
--replace "/usr/sbin/" "" \
--replace "/bin/" "" \
--replace "INSTALLNAME=/System" "INSTALLNAME=$out" \
- --replace "install_name_tool -id /System" "install_name_tool -id $out" \
+ --replace "install_name_tool -id /System/Library/Frameworks" "install_name_tool -id @rpath" \
--replace 'chown -RH -f root:wheel $(DSTBASE)/CoreFoundation.framework' "" \
--replace 'chmod -RH' 'chmod -R'
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 61b7df19543..6739ce3f5c8 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -300,6 +300,7 @@ in rec {
targetPlatform = localSystem;
preHook = commonPreHook + ''
+ export NIX_COREFOUNDATION_RPATH=${pkgs.darwin.CF}/Library/Frameworks
export PATH_LOCALE=${pkgs.darwin.locale}/share/locale
'';