vim: make it possible to build with --enable-gui=gtk3
This doesn't change any defaults; I suspect that dropping gtk2 support would annoy some people so I didn't want to do that without asking around first.
This commit is contained in:
parent
61c48d9c45
commit
3dd2a271ef
|
@ -1,7 +1,7 @@
|
||||||
# TODO tidy up eg The patchelf code is patching gvim even if you don't build it..
|
# 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
|
# but I have gvim with python support now :) - Marc
|
||||||
args@{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, gettext
|
args@{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, gettext
|
||||||
, composableDerivation, writeText, lib, config, glib, gtk2, python, perl, tcl, ruby
|
, composableDerivation, writeText, lib, config, glib, gtk2, gtk3, python, perl, tcl, ruby
|
||||||
, libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu
|
, libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu
|
||||||
, libICE
|
, libICE
|
||||||
|
|
||||||
|
@ -69,8 +69,8 @@ composableDerivation {
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
|
|
||||||
buildInputs
|
buildInputs
|
||||||
= [ ncurses gtk2 libX11 libXext libSM libXpm libXt libXaw libXau
|
= [ ncurses libX11 libXext libSM libXpm libXt libXaw libXau
|
||||||
libXmu glib libICE ];
|
libXmu glib libICE ] ++ (if args.gui == "gtk3" then [gtk3] else [gtk2]);
|
||||||
|
|
||||||
# most interpreters aren't tested yet.. (see python for example how to do it)
|
# most interpreters aren't tested yet.. (see python for example how to do it)
|
||||||
flags = {
|
flags = {
|
||||||
|
@ -149,7 +149,7 @@ composableDerivation {
|
||||||
ftNixSupport = config.vim.ftNix or true;
|
ftNixSupport = config.vim.ftNix or true;
|
||||||
};
|
};
|
||||||
|
|
||||||
#--enable-gui=OPTS X11 GUI default=auto OPTS=auto/no/gtk/gtk2/gnome/gnome2/motif/athena/neXtaw/photon/carbon
|
#--enable-gui=OPTS X11 GUI default=auto OPTS=auto/no/gtk/gtk2/gtk3/gnome/gnome2/motif/athena/neXtaw/photon/carbon
|
||||||
/*
|
/*
|
||||||
// edf "gtk_check" "gtk_check" { } #If auto-select GUI, check for GTK default=yes
|
// edf "gtk_check" "gtk_check" { } #If auto-select GUI, check for GTK default=yes
|
||||||
// edf "gtk2_check" "gtk2_check" { } #If GTK GUI, check for GTK+ 2 default=yes
|
// edf "gtk2_check" "gtk2_check" { } #If GTK GUI, check for GTK+ 2 default=yes
|
||||||
|
@ -171,4 +171,3 @@ composableDerivation {
|
||||||
|
|
||||||
dontStrip = 1;
|
dontStrip = 1;
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue