summary refs log tree commit diff
path: root/nixos/modules/programs/dconf.nix
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-08-18 21:54:00 -0400
committerworldofpeace <worldofpeace@protonmail.ch>2019-08-18 21:54:00 -0400
commit918b7d572f4caf5b4a91be1eded7aef49bc35f55 (patch)
tree1ed35ee6ab61a82c3dc3ed3f17913b0a429da591 /nixos/modules/programs/dconf.nix
parent93391858808065d9856168ad235c05fe87258dac (diff)
downloadnixpkgs-918b7d572f4caf5b4a91be1eded7aef49bc35f55.tar
nixpkgs-918b7d572f4caf5b4a91be1eded7aef49bc35f55.tar.gz
nixpkgs-918b7d572f4caf5b4a91be1eded7aef49bc35f55.tar.bz2
nixpkgs-918b7d572f4caf5b4a91be1eded7aef49bc35f55.tar.lz
nixpkgs-918b7d572f4caf5b4a91be1eded7aef49bc35f55.tar.xz
nixpkgs-918b7d572f4caf5b4a91be1eded7aef49bc35f55.tar.zst
nixpkgs-918b7d572f4caf5b4a91be1eded7aef49bc35f55.zip
nixos/dconf: cleanup
Add dconf to systemPackages and make GIO_EXTRA_MODULES
a list so it can actually merge.
Diffstat (limited to 'nixos/modules/programs/dconf.nix')
-rw-r--r--nixos/modules/programs/dconf.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/programs/dconf.nix b/nixos/modules/programs/dconf.nix
index b7bfb8504b6..eeebc3558bd 100644
--- a/nixos/modules/programs/dconf.nix
+++ b/nixos/modules/programs/dconf.nix
@@ -34,11 +34,11 @@ in
 
     services.dbus.packages = [ pkgs.gnome3.dconf ];
 
-    environment.variables.GIO_EXTRA_MODULES = optional cfg.enable
-      "${pkgs.gnome3.dconf.lib}/lib/gio/modules";
-    # https://github.com/NixOS/nixpkgs/pull/31891
-    #environment.variables.XDG_DATA_DIRS = optional cfg.enable
-    #  "$(echo ${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas-*)";
+    # For dconf executable
+    environment.systemPackages = [ pkgs.gnome3.dconf ];
+
+    # Needed for unwrapped applications
+    environment.variables.GIO_EXTRA_MODULES = mkIf cfg.enable [ "${pkgs.gnome3.dconf.lib}/lib/gio/modules" ];
   };
 
 }