diff options
| author | Naïm Favier <n@monade.li> | 2022-01-15 21:53:58 +0100 |
|---|---|---|
| committer | Naïm Favier <n@monade.li> | 2022-01-21 00:44:35 +0100 |
| commit | 23cfef7ec0b27f88992c75ccebb9eae371f22041 (patch) | |
| tree | a051fc2a4c1fcec8c94878ee409480c9d620928b | |
| parent | d25ffc3a0c299f9ef98578898709ff7ffc031137 (diff) | |
| download | nixpkgs-23cfef7ec0b27f88992c75ccebb9eae371f22041.tar nixpkgs-23cfef7ec0b27f88992c75ccebb9eae371f22041.tar.gz nixpkgs-23cfef7ec0b27f88992c75ccebb9eae371f22041.tar.bz2 nixpkgs-23cfef7ec0b27f88992c75ccebb9eae371f22041.tar.lz nixpkgs-23cfef7ec0b27f88992c75ccebb9eae371f22041.tar.xz nixpkgs-23cfef7ec0b27f88992c75ccebb9eae371f22041.tar.zst nixpkgs-23cfef7ec0b27f88992c75ccebb9eae371f22041.zip | |
nixos: make GIO_EXTRA_MODULES a session variable
Allow applications started by the systemd user session manager to find their GIO_EXTRA_MODULES.
| -rw-r--r-- | nixos/modules/programs/dconf.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/desktops/gnome/glib-networking.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/desktops/gvfs.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/x11/display-managers/gdm.nix | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/nixos/modules/programs/dconf.nix b/nixos/modules/programs/dconf.nix index 298abac8afa..265c41cbbbc 100644 --- a/nixos/modules/programs/dconf.nix +++ b/nixos/modules/programs/dconf.nix @@ -60,7 +60,7 @@ in environment.systemPackages = [ pkgs.dconf ]; # Needed for unwrapped applications - environment.variables.GIO_EXTRA_MODULES = mkIf cfg.enable [ "${pkgs.dconf.lib}/lib/gio/modules" ]; + environment.sessionVariables.GIO_EXTRA_MODULES = mkIf cfg.enable [ "${pkgs.dconf.lib}/lib/gio/modules" ]; }; } diff --git a/nixos/modules/services/desktops/gnome/glib-networking.nix b/nixos/modules/services/desktops/gnome/glib-networking.nix index 4288b6b5de6..1039605391a 100644 --- a/nixos/modules/services/desktops/gnome/glib-networking.nix +++ b/nixos/modules/services/desktops/gnome/glib-networking.nix @@ -38,7 +38,7 @@ with lib; systemd.packages = [ pkgs.glib-networking ]; - environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.glib-networking.out}/lib/gio/modules" ]; + environment.sessionVariables.GIO_EXTRA_MODULES = [ "${pkgs.glib-networking.out}/lib/gio/modules" ]; }; diff --git a/nixos/modules/services/desktops/gvfs.nix b/nixos/modules/services/desktops/gvfs.nix index 27864fad4f2..1aa64ea37db 100644 --- a/nixos/modules/services/desktops/gvfs.nix +++ b/nixos/modules/services/desktops/gvfs.nix @@ -57,7 +57,7 @@ in services.udev.packages = [ pkgs.libmtp.out ]; # Needed for unwrapped applications - environment.variables.GIO_EXTRA_MODULES = [ "${cfg.package}/lib/gio/modules" ]; + environment.sessionVariables.GIO_EXTRA_MODULES = [ "${cfg.package}/lib/gio/modules" ]; }; diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 386bba91ed9..1a0383623b2 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -149,6 +149,7 @@ in environment = { GDM_X_SERVER_EXTRA_ARGS = toString (filter (arg: arg != "-terminate") cfg.xserverArgs); + # GDM is needed for gnome-login.session XDG_DATA_DIRS = "${gdm}/share:${cfg.sessionData.desktops}/share"; } // optionalAttrs (xSessionWrapper != null) { # Make GDM use this wrapper before running the session, which runs the |