diff options
| author | Vladimír Čunát <v@cunat.cz> | 2021-09-22 17:27:57 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2021-09-22 17:28:37 +0200 |
| commit | 8be55167562eef7e55802c446f86783c70b99c80 (patch) | |
| tree | 72764ee2361f78d5b819778c1db68b1d1668e4c7 /nixos/modules/programs | |
| parent | 6cc26a9a3437f42da76c0c841f063acda0e7bbac (diff) | |
| parent | 5abd562a1867c0f77de2531d652c24f709ed86e8 (diff) | |
Merge #138918: Fix several NixOS errors in Hydra evaluation
In particular, this should unblock the trunk-combined jobset.
Diffstat (limited to 'nixos/modules/programs')
| -rw-r--r-- | nixos/modules/programs/atop.nix | 11 | ||||
| -rw-r--r-- | nixos/modules/programs/plotinus.nix | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/nixos/modules/programs/atop.nix b/nixos/modules/programs/atop.nix index b45eb16e3eaf6..918c228b3f52d 100644 --- a/nixos/modules/programs/atop.nix +++ b/nixos/modules/programs/atop.nix @@ -141,8 +141,15 @@ in // mkService cfg.atopgpu.enable "atopgpu" [ atop ]; timers = mkTimer cfg.atopRotateTimer.enable "atop-rotate" [ atop ]; }; - security.wrappers = - lib.mkIf cfg.setuidWrapper.enable { atop = { source = "${atop}/bin/atop"; }; }; + + security.wrappers = lib.mkIf cfg.setuidWrapper.enable { + atop = + { setuid = true; + owner = "root"; + group = "root"; + source = "${atop}/bin/atop"; + }; + }; } ); } diff --git a/nixos/modules/programs/plotinus.nix b/nixos/modules/programs/plotinus.nix index e3549c79588b2..2c90a41ba0296 100644 --- a/nixos/modules/programs/plotinus.nix +++ b/nixos/modules/programs/plotinus.nix @@ -30,7 +30,7 @@ in ###### implementation config = mkIf cfg.enable { - environment.variables.XDG_DATA_DIRS = [ "${pkgs.plotinus}/share/gsettings-schemas/${pkgs.plotinus.name}" ]; + environment.sessionVariables.XDG_DATA_DIRS = [ "${pkgs.plotinus}/share/gsettings-schemas/${pkgs.plotinus.name}" ]; environment.variables.GTK3_MODULES = [ "${pkgs.plotinus}/lib/libplotinus.so" ]; }; } |