apple-sdk: update frameworks location

Some have been removed like:

- DrawSprocket
- DVComponentGlue
This commit is contained in:
Matthew Bauer 2019-03-09 20:13:00 -05:00
parent 565f28fba7
commit 4903e825fa
2 changed files with 5 additions and 18 deletions

View File

@ -40,12 +40,6 @@ let
pushd lib pushd lib
ln -s -L /usr/lib/libcups*.dylib . ln -s -L /usr/lib/libcups*.dylib .
popd 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; { meta = with stdenv.lib; {
@ -80,13 +74,12 @@ let
# Keep track of if this is a child or a child rescue as with # Keep track of if this is a child or a child rescue as with
# ApplicationServices in the 10.9 SDK # ApplicationServices in the 10.9 SDK
local isChild local isChild=0
if [ -d "${sdk.out}/Library/Frameworks/$path/Versions/$current/Headers" ]; then if [ -d "${sdk.out}/Library/Frameworks/$path/Versions/$current/Headers" ]; then
isChild=1 isChild=1
cp -R "${sdk.out}/Library/Frameworks/$path/Versions/$current/Headers" . cp -R "${sdk.out}/Library/Frameworks/$path/Versions/$current/Headers" .
else elif [ -d "${sdk.out}/Library/Frameworks/$name.framework/Versions/$current/Headers" ]; then
isChild=0
current="$(readlink "/System/Library/Frameworks/$name.framework/Versions/Current")" current="$(readlink "/System/Library/Frameworks/$name.framework/Versions/Current")"
cp -R "${sdk.out}/Library/Frameworks/$name.framework/Versions/$current/Headers" . cp -R "${sdk.out}/Library/Frameworks/$name.framework/Versions/$current/Headers" .
fi fi
@ -103,11 +96,6 @@ let
pushd "${sdk.out}/Library/Frameworks/$name.framework/Versions/$current" >/dev/null pushd "${sdk.out}/Library/Frameworks/$name.framework/Versions/$current" >/dev/null
fi fi
local children=$(echo Frameworks/*.framework) 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 popd >/dev/null
for child in $children; do for child in $children; do

View File

@ -29,6 +29,7 @@ with frameworks; with libs; {
CoreAudioKit = [ AudioUnit ]; CoreAudioKit = [ AudioUnit ];
CoreData = []; CoreData = [];
CoreGraphics = [ Accelerate CF IOKit IOSurface SystemConfiguration ]; CoreGraphics = [ Accelerate CF IOKit IOSurface SystemConfiguration ];
CoreImage = [ ];
CoreLocation = []; CoreLocation = [];
CoreMIDI = [ CF ]; CoreMIDI = [ CF ];
CoreMIDIServer = []; CoreMIDIServer = [];
@ -37,13 +38,11 @@ with frameworks; with libs; {
CoreText = [ CF CoreGraphics ]; CoreText = [ CF CoreGraphics ];
CoreVideo = [ ApplicationServices CF CoreGraphics IOSurface OpenGL ]; CoreVideo = [ ApplicationServices CF CoreGraphics IOSurface OpenGL ];
CoreWLAN = [ SecurityFoundation ]; CoreWLAN = [ SecurityFoundation ];
DVComponentGlue = [ CoreServices QuickTime ];
DVDPlayback = []; DVDPlayback = [];
DirectoryService = [ CF ]; DirectoryService = [ CF ];
DiscRecording = [ CF CoreServices IOKit ]; DiscRecording = [ CF CoreServices IOKit ];
DiscRecordingUI = []; DiscRecordingUI = [];
DiskArbitration = [ CF IOKit ]; DiskArbitration = [ CF IOKit ];
DrawSprocket = [ Carbon ];
EventKit = []; EventKit = [];
ExceptionHandling = []; ExceptionHandling = [];
FWAUserLib = []; FWAUserLib = [];
@ -84,7 +83,6 @@ with frameworks; with libs; {
PubSub = []; PubSub = [];
QTKit = [ CoreMediaIO CoreMedia MediaToolbox QuickTime VideoToolbox ]; QTKit = [ CoreMediaIO CoreMedia MediaToolbox QuickTime VideoToolbox ];
QuickLook = [ ApplicationServices CF ]; QuickLook = [ ApplicationServices CF ];
QuickTime = [ ApplicationServices AudioUnit Carbon CoreAudio CoreServices OpenGL QuartzCore ];
SceneKit = []; SceneKit = [];
ScreenSaver = []; ScreenSaver = [];
Scripting = []; Scripting = [];
@ -114,7 +112,8 @@ with frameworks; with libs; {
JavaVM = []; JavaVM = [];
OpenDirectory = []; OpenDirectory = [];
Quartz = [ QuickLook QTKit ]; Quartz = [ QuickLook QTKit ];
QuartzCore = [ ApplicationServices CF CoreVideo OpenCL ]; QuartzCore = [ ApplicationServices CF CoreVideo OpenCL CoreImage ];
QuickTime = [ ApplicationServices AudioUnit Carbon CoreAudio CoreServices OpenGL QuartzCore ];
vmnet = []; vmnet = [];
} }