darwin-frameworks: move fixup setup-hook
This commit is contained in:
parent
cc1bfbd9a7
commit
5a28fd660a
@ -1,31 +0,0 @@
|
||||
# On macOS, frameworks are linked to the system CoreFoundation but
|
||||
# dynamic libraries built with nix use a pure version of CF this
|
||||
# causes segfaults for binaries that depend on it at runtime. This
|
||||
# can be solved in two ways.
|
||||
# 1. Rewrite references to the pure CF using this setup hook, this
|
||||
# works for the simple case but this can still cause problems if other
|
||||
# dependencies (eg. python) use the pure CF.
|
||||
# 2. Create a wrapper for the binary that sets DYLD_FRAMEWORK_PATH to
|
||||
# /System/Library/Frameworks. This will make everything load the
|
||||
# system's CoreFoundation framework while still keeping the
|
||||
# dependencies pure for other packages.
|
||||
|
||||
fixupOutputHooks+=('fixDarwinFrameworksIn $prefix')
|
||||
|
||||
fixDarwinFrameworks() {
|
||||
local systemPrefix='/System/Library/Frameworks'
|
||||
|
||||
for fn in "$@"; do
|
||||
if [ -L "$fn" ]; then continue; fi
|
||||
echo "$fn: fixing dylib"
|
||||
|
||||
for framework in $(otool -L "$fn" | awk '/CoreFoundation\.framework/ {print $1}'); do
|
||||
install_name_tool -change "$framework" "$systemPrefix/CoreFoundation.framework/Versions/A/CoreFoundation" "$fn" >&2
|
||||
done
|
||||
done
|
||||
}
|
||||
|
||||
fixDarwinFrameworksIn() {
|
||||
local dir="$1"
|
||||
fixDarwinFrameworks $(find "$dir" -name "*.dylib")
|
||||
}
|
@ -1,3 +1,36 @@
|
||||
# On macOS, frameworks are linked to the system CoreFoundation but
|
||||
# dynamic libraries built with nix use a pure version of CF this
|
||||
# causes segfaults for binaries that depend on it at runtime. This
|
||||
# can be solved in two ways.
|
||||
# 1. Rewrite references to the pure CF using this setup hook, this
|
||||
# works for the simple case but this can still cause problems if other
|
||||
# dependencies (eg. python) use the pure CF.
|
||||
# 2. Create a wrapper for the binary that sets DYLD_FRAMEWORK_PATH to
|
||||
# /System/Library/Frameworks. This will make everything load the
|
||||
# system's CoreFoundation framework while still keeping the
|
||||
# dependencies pure for other packages.
|
||||
|
||||
fixupOutputHooks+=('fixDarwinFrameworksIn $prefix')
|
||||
|
||||
fixDarwinFrameworks() {
|
||||
local systemPrefix='/System/Library/Frameworks'
|
||||
|
||||
for fn in "$@"; do
|
||||
if [ -L "$fn" ]; then continue; fi
|
||||
echo "$fn: fixing dylib"
|
||||
|
||||
for framework in $(otool -L "$fn" | awk '/CoreFoundation\.framework/ {print $1}'); do
|
||||
install_name_tool -change "$framework" "$systemPrefix/CoreFoundation.framework/Versions/A/CoreFoundation" "$fn" >&2
|
||||
done
|
||||
done
|
||||
}
|
||||
|
||||
fixDarwinFrameworksIn() {
|
||||
local dir="$1"
|
||||
fixDarwinFrameworks $(find "$dir" -name "*.dylib")
|
||||
}
|
||||
|
||||
|
||||
# This configures the stdenv to use /System/Library/Frameworks/CoreFoundation.framework
|
||||
# instead of the nix version by including the system frameworks path
|
||||
# as an rpath entry when creating binaries.
|
||||
|
@ -328,8 +328,6 @@ with pkgs;
|
||||
|
||||
fixDarwinDylibNames = makeSetupHook { } ../build-support/setup-hooks/fix-darwin-dylib-names.sh;
|
||||
|
||||
fixDarwinFrameworks = makeSetupHook { } ../build-support/setup-hooks/fix-darwin-frameworks.sh;
|
||||
|
||||
keepBuildTree = makeSetupHook { } ../build-support/setup-hooks/keep-build-tree.sh;
|
||||
|
||||
enableGCOVInstrumentation = makeSetupHook { } ../build-support/setup-hooks/enable-coverage-instrumentation.sh;
|
||||
|
Loading…
Reference in New Issue
Block a user