diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index c8641f24328..ab7b08d8186 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ncurses, gettext, pkgconfig # apple frameworks -, CoreServices, CoreData, Cocoa, Foundation, libobjc, cf-private }: +, Carbon, Cocoa }: stdenv.mkDerivation rec { name = "vim-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ ncurses pkgconfig ] - ++ stdenv.lib.optionals stdenv.isDarwin [ cf-private CoreData CoreServices Cocoa Foundation libobjc ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; nativeBuildInputs = [ gettext ]; configureFlags = [ diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix index af95dd604bb..83665b7cf32 100644 --- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix @@ -21,7 +21,7 @@ with frameworks; with libs; { Automator = []; CFNetwork = [ CF ]; CalendarStore = []; - Cocoa = [ Foundation ]; + Cocoa = [ AppKit ]; Collaboration = []; CoreAudio = [ CF IOKit ]; CoreAudioKit = [ AudioUnit ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 567b4d1608d..04bee38c0d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13168,8 +13168,7 @@ let }; vim = callPackage ../applications/editors/vim { - inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Foundation CoreData; - inherit (darwin) libobjc cf-private; + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; macvim = callPackage ../applications/editors/vim/macvim.nix { stdenv = clangStdenv; };