diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-10 11:08:54 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-10 11:08:54 +0100 |
commit | 53d00c335194e01f536b4a9ff024c8b841e9d334 (patch) | |
tree | 84f53af51cc1578c01422d8a552779b7d2894689 /pkgs/os-specific/darwin | |
parent | 322f87137c018813a9f3d6d9fbdfb208c430f154 (diff) | |
parent | 40c567de0fb2e72cd9821b4cd84d21debdd33e95 (diff) | |
download | nixlib-53d00c335194e01f536b4a9ff024c8b841e9d334.tar nixlib-53d00c335194e01f536b4a9ff024c8b841e9d334.tar.gz nixlib-53d00c335194e01f536b4a9ff024c8b841e9d334.tar.bz2 nixlib-53d00c335194e01f536b4a9ff024c8b841e9d334.tar.lz nixlib-53d00c335194e01f536b4a9ff024c8b841e9d334.tar.xz nixlib-53d00c335194e01f536b4a9ff024c8b841e9d334.tar.zst nixlib-53d00c335194e01f536b4a9ff024c8b841e9d334.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific/darwin')
-rw-r--r-- | pkgs/os-specific/darwin/apple-sdk/frameworks.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix index 9e47b8d02fdf..aab2852c1689 100644 --- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix @@ -34,7 +34,7 @@ with frameworks; with libs; { CoreMIDIServer = []; CoreMedia = [ ApplicationServices AudioToolbox CoreAudio CF CoreGraphics CoreVideo ]; CoreMediaIO = [ CF CoreMedia ]; - CoreText = [ CF CoreGraphics cf-private ]; + CoreText = [ CF CoreGraphics ]; CoreVideo = [ ApplicationServices CF CoreGraphics IOSurface OpenGL ]; CoreWLAN = [ SecurityFoundation ]; DVComponentGlue = [ CoreServices QuickTime ]; @@ -48,8 +48,7 @@ with frameworks; with libs; { ExceptionHandling = []; FWAUserLib = []; ForceFeedback = [ CF IOKit ]; - # cf-private was moved first in list because of https://github.com/NixOS/nixpkgs/pull/28635 - Foundation = [ cf-private CF libobjc Security ApplicationServices SystemConfiguration ]; + Foundation = [ CF libobjc Security ApplicationServices SystemConfiguration ]; GLKit = [ CF ]; GLUT = [ OpenGL ]; GSS = []; |