From 0a23e412b42c93df1c258a300109268f026e5456 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Mon, 26 Oct 2015 12:38:57 -0700 Subject: [PATCH] in darwin sdk, copy headers rather than linking them --- pkgs/os-specific/darwin/apple-sdk/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index 11b9b4a83a3f..47dce7b6620c 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -59,11 +59,14 @@ let local dest="$out/Library/Frameworks/$path" local name="$(basename "$path" .framework)" local current="$(readlink "/System/Library/Frameworks/$path/Versions/Current")" + if [ -z "$current" ]; then + current=A + fi mkdir -p "$dest" pushd "$dest" >/dev/null - ln -s "${sdk}/Library/Frameworks/$path/Versions/$current/Headers" + cp -R "${sdk}/Library/Frameworks/$path/Versions/$current/Headers" . ln -s -L "/System/Library/Frameworks/$path/Versions/$current/$name" ln -s -L "/System/Library/Frameworks/$path/Versions/$current/Resources" @@ -157,13 +160,6 @@ in rec { f="$out/Library/Frameworks/QuartzCore.framework/Headers/CoreImage.h" substituteInPlace "$f" \ --replace "QuartzCore/../Frameworks/CoreImage.framework/Headers" "CoreImage" - - # CoreImage.framework's location varies by OSX version - for linkedFile in "$out/Library/Frameworks/QuartzCore.framework/Frameworks/CoreImage.framework"/*; do - link=$(readlink "$linkedFile" | sed 's,//,/A/,') - rm "$linkedFile" - ln -s "$link" "$linkedFile" - done ''; }); };