JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vim: remove cf-private

Browse Source
This commit is contained in:
Daiderd Jordan 2019-06-19 23:18:39 +02:00
parent 1fc3bbcb06
commit b0e201f349
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/editors/vim/configurable.nix
View File

@ -10,7 +10,7 @@
, runtimeShell , runtimeShell
# apple frameworks # apple frameworks
, CoreServices, CoreData, Cocoa, Foundation, libobjc, cf-private , CoreServices, CoreData, Cocoa, Foundation, libobjc
, features ? "huge" # One of tiny, small, normal, big or huge , features ? "huge" # One of tiny, small, normal, big or huge
, wrapPythonDrv ? false , wrapPythonDrv ? false
@ -132,7 +132,7 @@ in stdenv.mkDerivation rec {
libXmu glib libICE ] libXmu glib libICE ]
++ stdenv.lib.optional (guiSupport == "gtk2") gtk2-x11 ++ stdenv.lib.optional (guiSupport == "gtk2") gtk2-x11
++ stdenv.lib.optional (guiSupport == "gtk3") gtk3-x11 ++ stdenv.lib.optional (guiSupport == "gtk3") gtk3-x11
++ stdenv.lib.optionals darwinSupport [ CoreServices CoreData Cocoa Foundation libobjc cf-private ] ++ stdenv.lib.optionals darwinSupport [ CoreServices CoreData Cocoa Foundation libobjc ]
++ stdenv.lib.optional luaSupport lua ++ stdenv.lib.optional luaSupport lua
++ stdenv.lib.optional pythonSupport python ++ stdenv.lib.optional pythonSupport python
++ stdenv.lib.optional tclSupport tcl ++ stdenv.lib.optional tclSupport tcl

8
pkgs/applications/editors/vim/default.nix
View File

@ -6,7 +6,7 @@
sha256 = "18ifhv5q9prd175q3vxbqf6qyvkk6bc7d2lhqdk0q78i68kv9y0c"; sha256 = "18ifhv5q9prd175q3vxbqf6qyvkk6bc7d2lhqdk0q78i68kv9y0c";
} }
# apple frameworks # apple frameworks
, cf-private, Carbon, Cocoa , Carbon, Cocoa
}: }:
let let
@ -19,11 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ gettext pkgconfig ]; nativeBuildInputs = [ gettext pkgconfig ];
buildInputs = [ ncurses ] buildInputs = [ ncurses ]
++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa ];
Carbon Cocoa
# Needed for OBJC_CLASS_$_NSArray symbols.
cf-private
];
configureFlags = [ configureFlags = [
"--enable-multibyte" "--enable-multibyte"

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

@ -20603,7 +20603,6 @@ in
}; };
vim = callPackage ../applications/editors/vim { vim = callPackage ../applications/editors/vim {
inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
}; };
@ -20615,7 +20614,7 @@ in
vim_configurable = vimUtils.makeCustomizable (callPackage ../applications/editors/vim/configurable.nix { vim_configurable = vimUtils.makeCustomizable (callPackage ../applications/editors/vim/configurable.nix {
inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Foundation CoreData; inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Foundation CoreData;
inherit (darwin) libobjc cf-private; inherit (darwin) libobjc;
gtk2 = if stdenv.isDarwin then gtk2-x11 else gtk2; gtk2 = if stdenv.isDarwin then gtk2-x11 else gtk2;
gtk3 = if stdenv.isDarwin then gtk3-x11 else gtk3; gtk3 = if stdenv.isDarwin then gtk3-x11 else gtk3;
}); });