Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nixos: make GIO_EXTRA_MODULES a session variable, take two #151105

Merged
merged 3 commits into from
Feb 2, 2022
Merged

nixos: make GIO_EXTRA_MODULES a session variable, take two #151105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d25ffc3
nixos/gdm: add gdm to XDG_DATA_DIRS
ncfavier Jan 15, 2022
23cfef7
nixos: make GIO_EXTRA_MODULES a session variable
ncfavier Jan 15, 2022
a298b23
nixos/tests: also set TimeoutStart in systemd.user.extraConfig
ncfavier Jan 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nixos/modules/programs/dconf.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ];
};

}
2 changes: 1 addition & 1 deletion nixos/modules/services/desktops/gnome/glib-networking.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ];

};

Expand Down
2 changes: 1 addition & 1 deletion nixos/modules/services/desktops/gvfs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ];

};

Expand Down
3 changes: 2 additions & 1 deletion nixos/modules/services/x11/display-managers/gdm.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,8 @@ in
environment = {
GDM_X_SERVER_EXTRA_ARGS = toString
(filter (arg: arg != "-terminate") cfg.xserverArgs);
XDG_DATA_DIRS = "${cfg.sessionData.desktops}/share/";
# 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
# configured setupCommands. This relies on a patched GDM which supports
Expand Down
4 changes: 4 additions & 0 deletions nixos/modules/testing/test-instrumentation.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,10 @@ in
# Allow very slow start
DefaultTimeoutStartSec=300
'';
systemd.user.extraConfig = ''
# Allow very slow start
DefaultTimeoutStartSec=300
'';

boot.consoleLogLevel = 7;

Expand Down