summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaiderd Jordan <daiderd@gmail.com>2018-11-05 00:24:04 +0100
committerDaiderd Jordan <daiderd@gmail.com>2018-11-05 00:24:04 +0100
commitf2fadc0e91abc0488fb7127d8513239a5885717c (patch)
treee8df4fe6432cf4fcf26f62afc6b87044b31da4e3
parent73cdd5a4762b3372634eed039912a0e25a5fd501 (diff)
downloadnixlib-f2fadc0e91abc0488fb7127d8513239a5885717c.tar
nixlib-f2fadc0e91abc0488fb7127d8513239a5885717c.tar.gz
nixlib-f2fadc0e91abc0488fb7127d8513239a5885717c.tar.bz2
nixlib-f2fadc0e91abc0488fb7127d8513239a5885717c.tar.lz
nixlib-f2fadc0e91abc0488fb7127d8513239a5885717c.tar.xz
nixlib-f2fadc0e91abc0488fb7127d8513239a5885717c.tar.zst
nixlib-f2fadc0e91abc0488fb7127d8513239a5885717c.zip
darwin: don't include cf-private in framework dependencies
Using cf-private can cause problems, it's better to include it
explicitly in places where it's actually required.
-rw-r--r--pkgs/os-specific/darwin/apple-sdk/frameworks.nix5
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                     = [];