diff options
| author | Doron Behar <doron.behar@gmail.com> | 2021-03-24 21:11:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-24 21:11:24 +0000 |
| commit | ede740d3b925b12d3609c5c9cf855a0cda05e6b6 (patch) | |
| tree | b6ef6619781c416ed5c65307c947904c023a36b9 /pkgs/applications/editors | |
| parent | 3b7a20b5fcdb09411011f916fee1c75f61aea693 (diff) | |
| parent | c49d77a600fc38601a421d12440b9867b7402e85 (diff) | |
| download | nixpkgs-ede740d3b925b12d3609c5c9cf855a0cda05e6b6.tar nixpkgs-ede740d3b925b12d3609c5c9cf855a0cda05e6b6.tar.gz nixpkgs-ede740d3b925b12d3609c5c9cf855a0cda05e6b6.tar.bz2 nixpkgs-ede740d3b925b12d3609c5c9cf855a0cda05e6b6.tar.lz nixpkgs-ede740d3b925b12d3609c5c9cf855a0cda05e6b6.tar.xz nixpkgs-ede740d3b925b12d3609c5c9cf855a0cda05e6b6.tar.zst nixpkgs-ede740d3b925b12d3609c5c9cf855a0cda05e6b6.zip | |
Merge pull request #117022 from doronbehar/pkg/vim_configurable
vim_configurable: Make disabling guiSupport easier
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/vim/configurable.nix | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 734b189d1e4..4215b20180e 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -75,7 +75,6 @@ in stdenv.mkDerivation rec { patches = [ ./cflags-prune.diff ] ++ lib.optional ftNixSupport ./ft-nix-support.patch; configureFlags = [ - "--enable-gui=${guiSupport}" "--with-features=${features}" "--disable-xsmp" # XSMP session management "--disable-xsmp_interact" # XSMP interaction @@ -95,6 +94,7 @@ in stdenv.mkDerivation rec { "--disable-carbon_check" "--disable-gtktest" ] + ++ lib.optional (guiSupport == "gtk2" || guiSupport == "gtk3") "--enable-gui=${guiSupport}" ++ lib.optional stdenv.isDarwin (if darwinSupport then "--enable-darwin" else "--disable-darwin") ++ lib.optionals luaSupport [ @@ -127,8 +127,22 @@ in stdenv.mkDerivation rec { ++ lib.optional (guiSupport == "gtk3") wrapGAppsHook ; - buildInputs = [ ncurses libX11 libXext libSM libXpm libXt libXaw libXau - libXmu glib libICE ] + buildInputs = [ + 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 == "gtk3") gtk3-x11 ++ lib.optionals darwinSupport [ CoreServices CoreData Cocoa Foundation libobjc ] |