public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki 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
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/editors/vim/default.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, ncurses, gettext, pkgconfig { stdenv, fetchFromGitHub, ncurses, gettext, pkgconfig
# apple frameworks # apple frameworks
, CoreServices, CoreData, Cocoa, Foundation, libobjc, cf-private }: , Carbon, Cocoa }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "vim-${version}"; name = "vim-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = [ ncurses pkgconfig ] buildInputs = [ ncurses pkgconfig ]
++ stdenv.lib.optionals stdenv.isDarwin [ cf-private CoreData CoreServices Cocoa Foundation libobjc ]; ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon Cocoa ];
nativeBuildInputs = [ gettext ]; nativeBuildInputs = [ gettext ];
configureFlags = [ configureFlags = [
pkgs/os-specific/darwin/apple-sdk/frameworks.nix
+1 -1
View File
@@ -21,7 +21,7 @@ with frameworks; with libs; {
Automator = []; Automator = [];
CFNetwork = [ CF ]; CFNetwork = [ CF ];
CalendarStore = []; CalendarStore = [];
Cocoa = [ Foundation ]; Cocoa = [ AppKit ];
Collaboration = []; Collaboration = [];
CoreAudio = [ CF IOKit ]; CoreAudio = [ CF IOKit ];
CoreAudioKit = [ AudioUnit ]; CoreAudioKit = [ AudioUnit ];
pkgs/top-level/all-packages.nix
+1 -2
View File
@@ -13168,8 +13168,7 @@ let
}; };
vim = callPackage ../applications/editors/vim { vim = callPackage ../applications/editors/vim {
inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Foundation CoreData; inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
inherit (darwin) libobjc cf-private;
}; };
macvim = callPackage ../applications/editors/vim/macvim.nix { stdenv = clangStdenv; }; macvim = callPackage ../applications/editors/vim/macvim.nix { stdenv = clangStdenv; };