alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

vim: clean up arguments list

Browse source
This commit is contained in:
Jude Taylor 2015-10-28 13:40:10 -07:00
parent 27e4137630
commit de0182ee59
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/editors/vim/default.nix
View file

@ -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 = [

2
pkgs/os-specific/darwin/apple-sdk/frameworks.nix
View file

@ -21,7 +21,7 @@ with frameworks; with libs; {
Automator = [];
CFNetwork = [ CF ];
CalendarStore = [];
Cocoa = [ Foundation ];
Cocoa = [ AppKit ];
Collaboration = [];
CoreAudio = [ CF IOKit ];
CoreAudioKit = [ AudioUnit ];

3
pkgs/top-level/all-packages.nix
View file

@ -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; };