diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-25 12:38:00 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-25 12:38:00 +0200 |
| commit | b2ab860db3996f28236c9ed92f08831dd6c6c5ef (patch) | |
| tree | 750213b30b0ba839b1bef5116695df92976a2032 /pkgs/applications/editors/vim | |
| parent | dae72e7e7dab5ae89d382471f4cccb888a5458e9 (diff) | |
| parent | fa05f332ebdf880abf147ad481288b704deb1367 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/editors/vim')
| -rw-r--r-- | pkgs/applications/editors/vim/configurable.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 3b75d08787e8..9fdbdba8e188 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -1,7 +1,7 @@ # TODO tidy up eg The patchelf code is patching gvim even if you don't build it.. # but I have gvim with python support now :) - Marc { source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, gettext -, writeText, config, glib, gtk2, gtk3, lua, python, perl, tcl, ruby +, writeText, config, glib, gtk2-x11, gtk3-x11, lua, python, perl, tcl, ruby , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu , libICE , vimPlugins @@ -130,8 +130,8 @@ in stdenv.mkDerivation rec { buildInputs = [ ncurses libX11 libXext libSM libXpm libXt libXaw libXau libXmu glib libICE ] - ++ stdenv.lib.optional (guiSupport == "gtk2") gtk2 - ++ stdenv.lib.optional (guiSupport == "gtk3") gtk3 + ++ stdenv.lib.optional (guiSupport == "gtk2") gtk2-x11 + ++ stdenv.lib.optional (guiSupport == "gtk3") gtk3-x11 ++ stdenv.lib.optionals darwinSupport [ CoreServices CoreData Cocoa Foundation libobjc cf-private ] ++ stdenv.lib.optional luaSupport lua ++ stdenv.lib.optional pythonSupport python |