From 78df37f04ddef8c19c99f847bae16559b1749159 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Sat, 20 Sep 2025 14:57:28 +0200 Subject: [PATCH] nixos/doas: add package option --- nixos/modules/security/doas.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/security/doas.nix b/nixos/modules/security/doas.nix index 659499a24258..b470783126e7 100644 --- a/nixos/modules/security/doas.nix +++ b/nixos/modules/security/doas.nix @@ -7,8 +7,6 @@ let cfg = config.security.doas; - inherit (pkgs) doas; - mkUsrString = user: toString user; mkGrpString = group: ":${toString group}"; @@ -67,6 +65,8 @@ in ''; }; + package = lib.mkPackageOption pkgs "doas" { }; + wheelNeedsPassword = lib.mkOption { type = with lib.types; bool; default = true; @@ -256,11 +256,11 @@ in setuid = true; owner = "root"; group = "root"; - source = "${doas}/bin/doas"; + source = lib.getExe cfg.package; }; environment.systemPackages = [ - doas + cfg.package ]; security.pam.services.doas = {