From 0f8e972f019a92f3670af5eb7ca3eb3c928330bb Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Sun, 17 May 2020 11:25:04 -0700 Subject: [PATCH] doas: enable timestamp by default and set pamdir * `--with-timestamp` enables the usage of the `persist` setting in `doas.conf`. It is possible some people might not want this, so the flag `withTimestamp` was added to control this. * `--pamdir` copies the PAM files to `$out/etc/pam.d`. This may or may not have a use in the future, but it removes a some errors from the build (when it tries to copy these files to /etc/pam.d). --- pkgs/tools/security/doas/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/security/doas/default.nix b/pkgs/tools/security/doas/default.nix index 58ada1086bcf..8cc9017a8fea 100644 --- a/pkgs/tools/security/doas/default.nix +++ b/pkgs/tools/security/doas/default.nix @@ -3,6 +3,8 @@ , fetchFromGitHub , bison , pam + +, withTimestamp ? true }: stdenv.mkDerivation rec { @@ -19,6 +21,11 @@ stdenv.mkDerivation rec { # otherwise confuses ./configure dontDisableStatic = true; + configureFlags = [ + (lib.optionalString withTimestamp "--with-timestamp") # to allow the "persist" setting + "--pamdir=${placeholder "out"}/etc/pam.d" + ]; + postPatch = '' sed -i '/\(chown\|chmod\)/d' bsd.prog.mk '';