summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2018-11-17 11:07:57 +0100
committerVladimír Čunát <vcunat@gmail.com>2018-11-17 11:18:10 +0100
commit80738ed9dc0ce48d7796baed5364eef8072c794d (patch)
treec739b86963868d33ff3e65fd520414aa22653cd1 /nixos
parent6d8953ba082b14b9563b47fff0f10a0d144196c9 (diff)
downloadnixpkgs-80738ed9dc0ce48d7796baed5364eef8072c794d.tar
nixpkgs-80738ed9dc0ce48d7796baed5364eef8072c794d.tar.gz
nixpkgs-80738ed9dc0ce48d7796baed5364eef8072c794d.tar.bz2
nixpkgs-80738ed9dc0ce48d7796baed5364eef8072c794d.tar.lz
nixpkgs-80738ed9dc0ce48d7796baed5364eef8072c794d.tar.xz
nixpkgs-80738ed9dc0ce48d7796baed5364eef8072c794d.tar.zst
nixpkgs-80738ed9dc0ce48d7796baed5364eef8072c794d.zip
nixos gtk.iconCache.enable: default from xserver.enable
It's a quick approximation to unblock unstable channels after #48116.
This commit isn't ideal, as I suspect most wayland users won't have
xserver.enable, so they will lose the icon cache in case they had gtk
in system path (otherwise they didn't get cache anyway).

I considered using environment.noXlibs, but the nixos tests installing
headless systems do *not* get that option, so we would still be pulling
gtk in many cases where it's clearly not desired.  We need to design
this more carefully.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/config/gtk/gtk-icon-cache.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/config/gtk/gtk-icon-cache.nix b/nixos/modules/config/gtk/gtk-icon-cache.nix
index d4e0cf97c66..9c5d993b9c5 100644
--- a/nixos/modules/config/gtk/gtk-icon-cache.nix
+++ b/nixos/modules/config/gtk/gtk-icon-cache.nix
@@ -5,7 +5,7 @@ with lib;
   options = {
     gtk.iconCache.enable = mkOption {
       type = types.bool;
-      default = true;
+      default = config.services.xserver.enable;
       description = ''
         Whether to build icon theme caches for GTK+ applications.
       '';