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

vim_configurable: Make disabling guiSupport easier

Browse Source 
Now it's possible to use in an overlay `guiSupport` set to `false`
(boolean) and doing so will disable many X related dependencies from
being used and the closure would be reduced automatically - Close #116716.
This commit is contained in:
Doron Behar 2021-03-20 13:01:48 +02:00
parent 1ae5e50d80
commit c49d77a600
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,7 +75,6 @@ in stdenv.mkDerivation rec {
patches = [ ./cflags-prune.diff ] ++ lib.optional ftNixSupport ./ft-nix-support.patch; patches = [ ./cflags-prune.diff ] ++ lib.optional ftNixSupport ./ft-nix-support.patch;
configureFlags = [ configureFlags = [
"--enable-gui=${guiSupport}"
"--with-features=${features}" "--with-features=${features}"
"--disable-xsmp" # XSMP session management "--disable-xsmp" # XSMP session management
"--disable-xsmp_interact" # XSMP interaction "--disable-xsmp_interact" # XSMP interaction
@ -95,6 +94,7 @@ in stdenv.mkDerivation rec {
"--disable-carbon_check" "--disable-carbon_check"
"--disable-gtktest" "--disable-gtktest"
] ]
++ lib.optional (guiSupport == "gtk2" || guiSupport == "gtk3") "--enable-gui=${guiSupport}"
++ lib.optional stdenv.isDarwin ++ lib.optional stdenv.isDarwin
(if darwinSupport then "--enable-darwin" else "--disable-darwin") (if darwinSupport then "--enable-darwin" else "--disable-darwin")
++ lib.optionals luaSupport [ ++ lib.optionals luaSupport [
@ -127,8 +127,22 @@ in stdenv.mkDerivation rec {
++ lib.optional (guiSupport == "gtk3") wrapGAppsHook ++ lib.optional (guiSupport == "gtk3") wrapGAppsHook
; ;
buildInputs = [ ncurses libX11 libXext libSM libXpm libXt libXaw libXau buildInputs = [
libXmu glib libICE ] ncurses
glib
]
# All X related dependencies
++ lib.optionals (guiSupport == "gtk2" || guiSupport == "gtk3") [
libSM
libICE
libX11
libXext
libXpm
libXt
libXaw
libXau
libXmu
]
++ lib.optional (guiSupport == "gtk2") gtk2-x11 ++ lib.optional (guiSupport == "gtk2") gtk2-x11
++ lib.optional (guiSupport == "gtk3") gtk3-x11 ++ lib.optional (guiSupport == "gtk3") gtk3-x11
++ lib.optionals darwinSupport [ CoreServices CoreData Cocoa Foundation libobjc ] ++ lib.optionals darwinSupport [ CoreServices CoreData Cocoa Foundation libobjc ]