apple-sdk: update frameworks location

Some have been removed like:

- DrawSprocket
- DVComponentGlue

2 files changed, 5 insertions, 18 deletions

diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix
index 71574998885..7c3e3e63967 100644
--- a/pkgs/os-specific/darwin/apple-sdk/default.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/default.nix
@@ -40,12 +40,6 @@ let
       pushd lib
       ln -s -L /usr/lib/libcups*.dylib .
       popd
-
-      cd Library/Frameworks/QuartzCore.framework/Versions/A/Headers
-      for file in CI*.h; do
-        rm $file
-        ln -s ../Frameworks/CoreImage.framework/Headers/$file
-      done
     '';
 
     meta = with stdenv.lib; {
@@ -80,13 +74,12 @@ let
 
         # Keep track of if this is a child or a child rescue as with
         # ApplicationServices in the 10.9 SDK
-        local isChild
+        local isChild=0
 
         if [ -d "${sdk.out}/Library/Frameworks/$path/Versions/$current/Headers" ]; then
           isChild=1
           cp -R "${sdk.out}/Library/Frameworks/$path/Versions/$current/Headers" .
-        else
-          isChild=0
+        elif [ -d "${sdk.out}/Library/Frameworks/$name.framework/Versions/$current/Headers" ]; then
           current="$(readlink "/System/Library/Frameworks/$name.framework/Versions/Current")"
           cp -R "${sdk.out}/Library/Frameworks/$name.framework/Versions/$current/Headers" .
         fi
@@ -103,11 +96,6 @@ let
           pushd "${sdk.out}/Library/Frameworks/$name.framework/Versions/$current" >/dev/null
         fi
         local children=$(echo Frameworks/*.framework)
-        if [ "$name" == "ApplicationServices" ]; then
-          # Fixing up ApplicationServices which is missing
-          # CoreGraphics in the 10.9 SDK
-          children="$children Frameworks/CoreGraphics.framework"
-        fi
         popd >/dev/null
 
         for child in $children; do
diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
index aab2852c168..603c7b32c55 100644
--- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
@@ -29,6 +29,7 @@ with frameworks; with libs; {
   CoreAudioKit            = [ AudioUnit ];
   CoreData                = [];
   CoreGraphics            = [ Accelerate CF IOKit IOSurface SystemConfiguration ];
+  CoreImage               = [ ];
   CoreLocation            = [];
   CoreMIDI                = [ CF ];
   CoreMIDIServer          = [];
@@ -37,13 +38,11 @@ with frameworks; with libs; {
   CoreText                = [ CF CoreGraphics ];
   CoreVideo               = [ ApplicationServices CF CoreGraphics IOSurface OpenGL ];
   CoreWLAN                = [ SecurityFoundation ];
-  DVComponentGlue         = [ CoreServices QuickTime ];
   DVDPlayback             = [];
   DirectoryService        = [ CF ];
   DiscRecording           = [ CF CoreServices IOKit ];
   DiscRecordingUI         = [];
   DiskArbitration         = [ CF IOKit ];
-  DrawSprocket            = [ Carbon ];
   EventKit                = [];
   ExceptionHandling       = [];
   FWAUserLib              = [];
@@ -84,7 +83,6 @@ with frameworks; with libs; {
   PubSub                  = [];
   QTKit                   = [ CoreMediaIO CoreMedia MediaToolbox QuickTime VideoToolbox ];
   QuickLook               = [ ApplicationServices CF ];
-  QuickTime               = [ ApplicationServices AudioUnit Carbon CoreAudio CoreServices OpenGL QuartzCore ];
   SceneKit                = [];
   ScreenSaver             = [];
   Scripting               = [];
@@ -114,7 +112,8 @@ with frameworks; with libs; {
   JavaVM              = [];
   OpenDirectory       = [];
   Quartz              = [ QuickLook QTKit ];
-  QuartzCore          = [ ApplicationServices CF CoreVideo OpenCL ];
+  QuartzCore          = [ ApplicationServices CF CoreVideo OpenCL CoreImage ];
+  QuickTime           = [ ApplicationServices AudioUnit Carbon CoreAudio CoreServices OpenGL QuartzCore ];
 
   vmnet = [];
 }