git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #62018 from dhruvio/vim_configurable

vim_configurable: build against gtk{2,3}-x11 instead of gtk{2,3} to fix builds on darwin

commit0b0265a9328a9d684b5d35adbdddb440cbe5bac4 authorMatthew Bauer <mjbauer95@gmail.com> dateFri 24 May 2019, 13:41 (7 years ago) parenteea307aca799c5
1 file changed+3−3
pkgs/applications/editors/vim/configurable.nix+3−3
pkgs/applications/editors/vim/configurable.nix+3−3
@@ -1,7 +1,7 @@
11# TODO tidy up eg The patchelf code is patching gvim even if you don't build it..
22# but I have gvim with python support now :) - Marc
33{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, gettext
4−, writeText, config, glib, gtk2, gtk3, lua, python, perl, tcl, ruby
4+, writeText, config, glib, gtk2-x11, gtk3-x11, lua, python, perl, tcl, ruby
55, libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu
66, libICE
77, vimPlugins
@@ -130,8 +130,8 @@ in stdenv.mkDerivation rec {
130130
131131 buildInputs = [ ncurses libX11 libXext libSM libXpm libXt libXaw libXau
132132 libXmu glib libICE ]
133− ++ stdenv.lib.optional (guiSupport == "gtk2") gtk2
134− ++ stdenv.lib.optional (guiSupport == "gtk3") gtk3
133+ ++ stdenv.lib.optional (guiSupport == "gtk2") gtk2-x11
134+ ++ stdenv.lib.optional (guiSupport == "gtk3") gtk3-x11
135135 ++ stdenv.lib.optionals darwinSupport [ CoreServices CoreData Cocoa Foundation libobjc cf-private ]
136136 ++ stdenv.lib.optional luaSupport lua
137137 ++ stdenv.lib.optional pythonSupport python