pyrox.dev / nixpkgs
lol
fork atom

nixos/system-environment: prepend wrapperDir to PATH (#70430)

This fixes user environment setup for sessions which doesn't successfully go
through a shell init.

Note we don't go through `sessionVariables` as we want the wrappers to have
highest priority. It would also cause wrapperDir to occur twice when in shell
sessions, as shells use `sessionVariables` too while prepending wrapperDir in a
custom snippet.

In particular logging in and out of gnome-shell could result in a broken path
without this fix.

Tor Hedin Brønner 2c7f0f06 81d15948

options
unified split
Changed files
+7
nixos
modules
config
system-environment.nix
+7
nixos/modules/config/system-environment.nix 
···

       
88

       
88

       
 

       
          (mapAttrsToList pamVariable


     

       
89

       
89

       
 

       
          (zipAttrsWith (n: concatLists)


     

       
90

       
90

       
 

       
            [


     

       

       
91

       
+

       
              # Make sure security wrappers are prioritized without polluting


     

       

       
92

       
+

       
              # shell environments with an extra entry. Sessions which depend on


     

       

       
93

       
+

       
              # pam for its environment will otherwise have eg. broken sudo. In


     

       

       
94

       
+

       
              # particular Gnome Shell sometimes fails to source a proper


     

       

       
95

       
+

       
              # environment from a shell.


     

       

       
96

       
+

       
              { PATH = [ config.security.wrapperDir ]; }


     

       

       
97

       
+

       



     

       
91

       
98

       
 

       
              (mapAttrs (n: toList) cfg.sessionVariables)


     

       
92

       
99

       
 

       
              suffixedVariables


     

       
93

       
100

       
 

       
            ]));