From 918b7d572f4caf5b4a91be1eded7aef49bc35f55 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 18 Aug 2019 21:54:00 -0400 Subject: nixos/dconf: cleanup Add dconf to systemPackages and make GIO_EXTRA_MODULES a list so it can actually merge. --- nixos/modules/programs/dconf.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'nixos/modules/programs/dconf.nix') 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" ]; }; } -- cgit 1.4.1