graalvm8: 19.1.1 -> 19.2.1
- - nixpkgs now with full darwin support
This commit is contained in:
@@ -61,9 +61,16 @@ let
|
||||
installPhase = ''
|
||||
linkFramework() {
|
||||
local path="$1"
|
||||
local nested_path="$1"
|
||||
local dest="$out/Library/Frameworks/$path"
|
||||
if [ "$path" == "JavaNativeFoundation.framework" ]; then
|
||||
local nested_path="JavaVM.framework/Versions/A/Frameworks/JavaNativeFoundation.framework"
|
||||
fi
|
||||
if [ "$path" == "JavaRuntimeSupport.framework" ]; then
|
||||
local nested_path="JavaVM.framework/Versions/A/Frameworks/JavaRuntimeSupport.framework"
|
||||
fi
|
||||
local name="$(basename "$path" .framework)"
|
||||
local current="$(readlink "/System/Library/Frameworks/$path/Versions/Current")"
|
||||
local current="$(readlink "/System/Library/Frameworks/$nested_path/Versions/Current")"
|
||||
if [ -z "$current" ]; then
|
||||
current=A
|
||||
fi
|
||||
@@ -75,25 +82,21 @@ let
|
||||
# ApplicationServices in the 10.9 SDK
|
||||
local isChild=0
|
||||
|
||||
if [ -d "${sdk.out}/Library/Frameworks/$path/Versions/$current/Headers" ]; then
|
||||
if [ -d "${sdk.out}/Library/Frameworks/$nested_path/Versions/$current/Headers" ]; then
|
||||
isChild=1
|
||||
cp -R "${sdk.out}/Library/Frameworks/$path/Versions/$current/Headers" .
|
||||
cp -R "${sdk.out}/Library/Frameworks/$nested_path/Versions/$current/Headers" .
|
||||
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
|
||||
ln -s -L "/System/Library/Frameworks/$path/Versions/$current/$name"
|
||||
ln -s -L "/System/Library/Frameworks/$path/Versions/$current/Resources"
|
||||
ln -s -L "/System/Library/Frameworks/$nested_path/Versions/$current/$name"
|
||||
ln -s -L "/System/Library/Frameworks/$nested_path/Versions/$current/Resources"
|
||||
|
||||
if [ -f "/System/Library/Frameworks/$path/module.map" ]; then
|
||||
ln -s "/System/Library/Frameworks/$path/module.map"
|
||||
if [ -f "/System/Library/Frameworks/$nested_path/module.map" ]; then
|
||||
ln -s "/System/Library/Frameworks/$nested_path/module.map"
|
||||
fi
|
||||
|
||||
if [ $isChild -eq 1 ]; then
|
||||
pushd "${sdk.out}/Library/Frameworks/$path/Versions/$current" >/dev/null
|
||||
else
|
||||
pushd "${sdk.out}/Library/Frameworks/$name.framework/Versions/$current" >/dev/null
|
||||
fi
|
||||
pushd "${sdk.out}/Library/Frameworks/$nested_path/Versions/$current" >/dev/null
|
||||
local children=$(echo Frameworks/*.framework)
|
||||
popd >/dev/null
|
||||
|
||||
@@ -109,7 +112,6 @@ let
|
||||
popd >/dev/null
|
||||
}
|
||||
|
||||
|
||||
linkFramework "${name}.framework"
|
||||
'';
|
||||
|
||||
|
||||
@@ -65,6 +65,8 @@ with frameworks; with libs; {
|
||||
InstallerPlugins = [];
|
||||
InstantMessage = [];
|
||||
JavaFrameEmbedding = [];
|
||||
JavaNativeFoundation = [];
|
||||
JavaRuntimeSupport = [];
|
||||
JavaScriptCore = [];
|
||||
Kerberos = [];
|
||||
Kernel = [ IOKit ];
|
||||
|
||||
Reference in New Issue
Block a user