nix-community/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2025-11-30 14:11:02 +01:00
Code Activity

dconf: Fix Gio module variable breakage (#7146) (#7163)

Browse source 
In some setups, this would cause missing Gio modules that cause e.g.
Nautilus to not be able to view the XDG trash, and potentially other
issues.

Fixes: ec8205c3 ("dconf: set env var")
Fixes: #7143
(cherry picked from commit d3a3aee558)

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
Co-authored-by: Thomas Mühlbacher <tmuehlbacher@posteo.net>
This commit is contained in:
Austin Horstman 2025-05-30 12:44:53 -05:00 • committed by GitHub
parent 0d13ea58d5
commit afe9ce8b20
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/misc/dconf.nix
View file

@ -80,7 +80,9 @@ in
(lib.mkIf cfg.enable { (lib.mkIf cfg.enable {
home.packages = [ pkgs.dconf ]; home.packages = [ pkgs.dconf ];
dbus.packages = [ pkgs.dconf ]; dbus.packages = [ pkgs.dconf ];
home.sessionVariables.GIO_EXTRA_MODULES = "${pkgs.dconf.lib}/lib/gio/modules"; home.sessionVariablesExtra = ''
export GIO_EXTRA_MODULES="${pkgs.dconf.lib}/lib/gio/modules''${GIO_EXTRA_MODULES:+:}$GIO_EXTRA_MODULES"
'';
}) })
(lib.mkIf (cfg.enable && cfg.settings != { }) { (lib.mkIf (cfg.enable && cfg.settings != { }) {
# Make sure the dconf directory exists. # Make sure the dconf directory exists.

2
tests/modules/home-environment/session-variables.nix
View file

@ -9,7 +9,6 @@ let
if [ -n "$__HM_SESS_VARS_SOURCED" ]; then return; fi if [ -n "$__HM_SESS_VARS_SOURCED" ]; then return; fi
export __HM_SESS_VARS_SOURCED=1 export __HM_SESS_VARS_SOURCED=1
export GIO_EXTRA_MODULES="${pkgs.dconf}/lib/gio/modules"
export LOCALE_ARCHIVE_2_27="${config.i18n.glibcLocales}/lib/locale/locale-archive" export LOCALE_ARCHIVE_2_27="${config.i18n.glibcLocales}/lib/locale/locale-archive"
export V1="v1" export V1="v1"
export V2="v2-v1" export V2="v2-v1"
@ -18,6 +17,7 @@ let
export XDG_DATA_HOME="/home/hm-user/.local/share" export XDG_DATA_HOME="/home/hm-user/.local/share"
export XDG_STATE_HOME="/home/hm-user/.local/state" export XDG_STATE_HOME="/home/hm-user/.local/state"
export GIO_EXTRA_MODULES="${pkgs.dconf}/lib/gio/modules''${GIO_EXTRA_MODULES:+:}$GIO_EXTRA_MODULES"
''; '';
darwinExpected = '' darwinExpected = ''