diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2022-02-02 19:35:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-02 19:35:58 +0100 |
| commit | 16658b7fe912554fe8880d00ed9fbdb15fd2cfe2 (patch) | |
| tree | 1721794ddb22ce3e7f7b95dad4bcd333c06153de | |
| parent | 950d8f16abf095bdc9ac6613e61e6639f76b970b (diff) | |
| parent | a298b23c10d740a986a8d372638a23f3f9d3f45f (diff) | |
| download | nixpkgs-16658b7fe912554fe8880d00ed9fbdb15fd2cfe2.tar nixpkgs-16658b7fe912554fe8880d00ed9fbdb15fd2cfe2.tar.gz nixpkgs-16658b7fe912554fe8880d00ed9fbdb15fd2cfe2.tar.bz2 nixpkgs-16658b7fe912554fe8880d00ed9fbdb15fd2cfe2.tar.lz nixpkgs-16658b7fe912554fe8880d00ed9fbdb15fd2cfe2.tar.xz nixpkgs-16658b7fe912554fe8880d00ed9fbdb15fd2cfe2.tar.zst nixpkgs-16658b7fe912554fe8880d00ed9fbdb15fd2cfe2.zip | |
Merge pull request #151105 from ncfavier/gio-extra-modules
nixos: make GIO_EXTRA_MODULES a session variable, take two
| -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 | 3 | ||||
| -rw-r--r-- | nixos/modules/testing/test-instrumentation.nix | 4 |
5 files changed, 9 insertions, 4 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 f9d4d3d6836..b1dc6643be8 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -140,7 +140,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 diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index a7011be7e04..01447e6ada8 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -109,6 +109,10 @@ in # Allow very slow start DefaultTimeoutStartSec=300 ''; + systemd.user.extraConfig = '' + # Allow very slow start + DefaultTimeoutStartSec=300 + ''; boot.consoleLogLevel = 7; |