commit 16658b7fe912554fe8880d00ed9fbdb15fd2cfe2 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/programs/dconf.nix

···

       60
       60
        
           environment.systemPackages = [ pkgs.dconf ];

     

       61
       61
        
       

     

       62
       62
        
           # Needed for unwrapped applications

     

       63
       63
       -
           environment.variables.GIO_EXTRA_MODULES = mkIf cfg.enable [ "${pkgs.dconf.lib}/lib/gio/modules" ];

     

       63
       63
       +
           environment.sessionVariables.GIO_EXTRA_MODULES = mkIf cfg.enable [ "${pkgs.dconf.lib}/lib/gio/modules" ];

     

       64
       64
        
         };

     

       65
       65
        
       

     

       66
       66
        
       }

+1 -1

nixos/modules/services/desktops/gnome/glib-networking.nix

···

       38
       38
        
       

     

       39
       39
        
           systemd.packages = [ pkgs.glib-networking ];

     

       40
       40
        
       

     

       41
       41
       -
           environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.glib-networking.out}/lib/gio/modules" ];

     

       41
       41
       +
           environment.sessionVariables.GIO_EXTRA_MODULES = [ "${pkgs.glib-networking.out}/lib/gio/modules" ];

     

       42
       42
        
       

     

       43
       43
        
         };

     

       44
       44

+1 -1

nixos/modules/services/desktops/gvfs.nix

···

       57
       57
        
           services.udev.packages = [ pkgs.libmtp.out ];

     

       58
       58
        
       

     

       59
       59
        
           # Needed for unwrapped applications

     

       60
       60
       -
           environment.variables.GIO_EXTRA_MODULES = [ "${cfg.package}/lib/gio/modules" ];

     

       60
       60
       +
           environment.sessionVariables.GIO_EXTRA_MODULES = [ "${cfg.package}/lib/gio/modules" ];

     

       61
       61
        
       

     

       62
       62
        
         };

     

       63
       63

+2 -1

nixos/modules/services/x11/display-managers/gdm.nix

···

       140
       140
        
               environment = {

     

       141
       141
        
                 GDM_X_SERVER_EXTRA_ARGS = toString

     

       142
       142
        
                   (filter (arg: arg != "-terminate") cfg.xserverArgs);

     

       143
       143
       -
                 XDG_DATA_DIRS = "${cfg.sessionData.desktops}/share/";

     

       143
       143
       +
                 # GDM is needed for gnome-login.session

     

       144
       144
       +
                 XDG_DATA_DIRS = "${gdm}/share:${cfg.sessionData.desktops}/share";

     

       144
       145
        
               } // optionalAttrs (xSessionWrapper != null) {

     

       145
       146
        
                 # Make GDM use this wrapper before running the session, which runs the

     

       146
       147
        
                 # configured setupCommands. This relies on a patched GDM which supports

+4

nixos/modules/testing/test-instrumentation.nix

···

       109
       109
        
             # Allow very slow start

     

       110
       110
        
             DefaultTimeoutStartSec=300

     

       111
       111
        
           '';

     

       112
       112
       +
           systemd.user.extraConfig = ''

     

       113
       113
       +
             # Allow very slow start

     

       114
       114
       +
             DefaultTimeoutStartSec=300

     

       115
       115
       +
           '';

     

       112
       116
        
       

     

       113
       117
        
           boot.consoleLogLevel = 7;

     

       114
       118