diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-03-07 22:10:07 +0100 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2017-03-12 15:19:04 +0100 |
| commit | 97a3e7cf52068f9e48d3d811f97638c73a513d85 (patch) | |
| tree | 695d41e96326f92e826dc2417caef08900db5662 /pkgs | |
| parent | 04fa8e006cf662a9cdefa52162e006304ad8877d (diff) | |
| download | nixlib-97a3e7cf52068f9e48d3d811f97638c73a513d85.tar nixlib-97a3e7cf52068f9e48d3d811f97638c73a513d85.tar.gz nixlib-97a3e7cf52068f9e48d3d811f97638c73a513d85.tar.bz2 nixlib-97a3e7cf52068f9e48d3d811f97638c73a513d85.tar.lz nixlib-97a3e7cf52068f9e48d3d811f97638c73a513d85.tar.xz nixlib-97a3e7cf52068f9e48d3d811f97638c73a513d85.tar.zst nixlib-97a3e7cf52068f9e48d3d811f97638c73a513d85.zip | |
darwin-frameworks: don't use pure CF
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/darwin/apple-sdk/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index 1148fe5c4a16..338e02b9df3d 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -119,6 +119,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" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f40f7d10577b..45f2438c782c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8733,7 +8733,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 { }; |