JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #22571 from LnL7/darwin-frameworks-hook

Browse Source 
add setup-hook to fix darwin frameworks
This commit is contained in:
Daniel Peebles 2017-03-15 11:33:23 -04:00 committed by GitHub
commit 38a03817b0
3 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkgs/build-support/setup-hooks/fix-darwin-frameworks.sh Normal file
View File

@ -0,0 +1,31 @@
# On Mac OS X, 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")
}

3
pkgs/os-specific/darwin/apple-sdk/default.nix
View File

@ -133,6 +133,9 @@ let
propagatedBuildInputs = deps;
# don't use pure CF for dylibs that depend on frameworks
setupHook = ../../../build-support/setup-hooks/fix-darwin-frameworks.sh;
# allows building the symlink tree
__impureHostDeps = [ "/System/Library/Frameworks/${name}.framework" ];

5
pkgs/top-level/all-packages.nix
View File

@ -305,6 +305,8 @@ 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;
@ -8743,7 +8745,8 @@ with pkgs;
libusb = callPackage ../development/libraries/libusb {};
libusb1 = callPackage ../development/libraries/libusb1 {
inherit (darwin) libobjc IOKit;
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.frameworks) IOKit;
};
libusbmuxd = callPackage ../development/libraries/libusbmuxd { };