summary refs log tree commit diff
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2021-12-08 19:52:32 +0100
committerJan Tojnar <jtojnar@gmail.com>2021-12-08 19:54:18 +0100
commitbcb4b714bdddec94d88ff974f242cdb3f3308dac (patch)
tree598e5fb26d539fccdb95362c2efac392e4182523
parentd33ea8e6f863fccea1a5823fdb2084427b16a5a1 (diff)
downloadnixpkgs-bcb4b714bdddec94d88ff974f242cdb3f3308dac.tar
nixpkgs-bcb4b714bdddec94d88ff974f242cdb3f3308dac.tar.gz
nixpkgs-bcb4b714bdddec94d88ff974f242cdb3f3308dac.tar.bz2
nixpkgs-bcb4b714bdddec94d88ff974f242cdb3f3308dac.tar.lz
nixpkgs-bcb4b714bdddec94d88ff974f242cdb3f3308dac.tar.xz
nixpkgs-bcb4b714bdddec94d88ff974f242cdb3f3308dac.tar.zst
nixpkgs-bcb4b714bdddec94d88ff974f242cdb3f3308dac.zip
Revert "nixos: make GIO_EXTRA_MODULES a session variable"
This reverts commit abfcb79abf3ba32eb4719c48915a143370093fb7.

Fixes: https://github.com/NixOS/nixpkgs/issues/149539
-rw-r--r--nixos/modules/programs/dconf.nix2
-rw-r--r--nixos/modules/services/desktops/gnome/glib-networking.nix2
-rw-r--r--nixos/modules/services/desktops/gvfs.nix2
3 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/programs/dconf.nix b/nixos/modules/programs/dconf.nix
index 265c41cbbbc..298abac8afa 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.sessionVariables.GIO_EXTRA_MODULES = mkIf cfg.enable [ "${pkgs.dconf.lib}/lib/gio/modules" ];
+    environment.variables.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 1039605391a..4288b6b5de6 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.sessionVariables.GIO_EXTRA_MODULES = [ "${pkgs.glib-networking.out}/lib/gio/modules" ];
+    environment.variables.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 f2b2855dc3e..b6a27279bdf 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.bin ];
 
     # Needed for unwrapped applications
-    environment.sessionVariables.GIO_EXTRA_MODULES = [ "${cfg.package}/lib/gio/modules" ];
+    environment.variables.GIO_EXTRA_MODULES = [ "${cfg.package}/lib/gio/modules" ];
 
   };