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

vim_configurable: use gtk3 on darwin

Browse Source
This commit is contained in:
Daiderd Jordan 2018-08-19 22:43:52 +02:00
parent e2ef327652
commit cfc3d7c918
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,7 @@
, features ? "huge" # One of tiny, small, normal, big or huge , features ? "huge" # One of tiny, small, normal, big or huge
, wrapPythonDrv ? false , wrapPythonDrv ? false
, guiSupport ? config.vim.gui or "auto" , guiSupport ? config.vim.gui or "gtk3"
, luaSupport ? config.vim.lua or true , luaSupport ? config.vim.lua or true
, perlSupport ? config.vim.perl or false # Perl interpreter , perlSupport ? config.vim.perl or false # Perl interpreter
, pythonSupport ? config.vim.python or true # Python interpreter , pythonSupport ? config.vim.python or true # Python interpreter

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

@ -9682,6 +9682,11 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
}; };
# On darwin gtk uses cocoa by default instead of x11.
gtk3-x11 = gtk3.override {
x11Support = true;
};
gtkmm2 = callPackage ../development/libraries/gtkmm/2.x.nix { }; gtkmm2 = callPackage ../development/libraries/gtkmm/2.x.nix { };
gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { }; gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { };
@ -18837,7 +18842,7 @@ with pkgs;
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 cf-private;
gtk2 = if stdenv.isDarwin then gtk2-x11 else gtk2; gtk2 = if stdenv.isDarwin then gtk2-x11 else gtk2;
guiSupport = if stdenv.isDarwin then "gtk2" else "gtk3"; gtk3 = if stdenv.isDarwin then gtk3-x11 else gtk3;
}); });
qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {}; qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {};