From cfc3d7c9181f543ddb2cf4aa61112957f58e4a4a Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 19 Aug 2018 22:43:52 +0200 Subject: [PATCH] vim_configurable: use gtk3 on darwin --- pkgs/applications/editors/vim/configurable.nix | 2 +- pkgs/top-level/all-packages.nix | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 73db70880f1..0945b4e4570 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -13,7 +13,7 @@ , features ? "huge" # One of tiny, small, normal, big or huge , wrapPythonDrv ? false -, guiSupport ? config.vim.gui or "auto" +, guiSupport ? config.vim.gui or "gtk3" , luaSupport ? config.vim.lua or true , perlSupport ? config.vim.perl or false # Perl interpreter , pythonSupport ? config.vim.python or true # Python interpreter diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99e2fb9cf97..59c4ed9d6ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9682,6 +9682,11 @@ with pkgs; 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 { }; 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) libobjc cf-private; 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 {};