diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-11-06 20:15:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-06 20:15:27 +0100 |
| commit | b6dcb9e641950d1ce2e56724573e77b9999ed043 (patch) | |
| tree | 2cd39e9aa154c731fa67ac663e1895f0f4cf77b6 /pkgs/os-specific | |
| parent | aed2dea55a9399c9513e65ff8248aff0205b5a3e (diff) | |
| parent | ecf7c9c4b4e7f5b3737cb4a92570333fde7684c0 (diff) | |
| download | nixpkgs-b6dcb9e641950d1ce2e56724573e77b9999ed043.tar nixpkgs-b6dcb9e641950d1ce2e56724573e77b9999ed043.tar.gz nixpkgs-b6dcb9e641950d1ce2e56724573e77b9999ed043.tar.bz2 nixpkgs-b6dcb9e641950d1ce2e56724573e77b9999ed043.tar.lz nixpkgs-b6dcb9e641950d1ce2e56724573e77b9999ed043.tar.xz nixpkgs-b6dcb9e641950d1ce2e56724573e77b9999ed043.tar.zst nixpkgs-b6dcb9e641950d1ce2e56724573e77b9999ed043.zip | |
Merge pull request #49768 from LnL7/darwin-no-cfprivate
darwin: don't include cf-private in framework dependencies
Diffstat (limited to 'pkgs/os-specific')
| -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 9e47b8d02fd..aab2852c168 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 = []; |