diff options
| author | Dmitry Bogatov <serenity@kaction.cc> | 2022-10-31 20:23:31 -0400 |
|---|---|---|
| committer | Cole Helbling <cole.e.helbling@outlook.com> | 2022-11-08 15:55:02 -0800 |
| commit | 6fd104a8adccfc7095faaf55941546955d123226 (patch) | |
| tree | 949be3273fdb69fb498de431b69e2ff5dce9cced /pkgs | |
| parent | 74f2b8901385b6bb74d0dcc832f1b310a46b497f (diff) | |
pkgsStatic.doas: fix build
* Patch configure script to not die on --disable-shared * Pass -laudit when building statically with PAM support. Upstream buiild system does not use pkg-config, unfortunately.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/security/doas/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/tools/security/doas/disable-shared.patch | 13 |
2 files changed, 20 insertions, 0 deletions
diff --git a/pkgs/tools/security/doas/default.nix b/pkgs/tools/security/doas/default.nix index 489bf2bb2aa3b..ce360d8234559 100644 --- a/pkgs/tools/security/doas/default.nix +++ b/pkgs/tools/security/doas/default.nix @@ -32,10 +32,17 @@ stdenv.mkDerivation rec { # Allow doas to discover binaries in /run/current-system/sw/{s,}bin and # /run/wrappers/bin ./0001-add-NixOS-specific-dirs-to-safe-PATH.patch + + # Standard environment supports "dontDisableStatic" knob, but has no + # equivalent for "--disable-shared", so I have to patch "configure" + # script instead. + ./disable-shared.patch ]; postPatch = '' sed -i '/\(chown\|chmod\)/d' GNUmakefile + '' + lib.optionalString (withPAM && stdenv.hostPlatform.isStatic) '' + sed -i 's/-lpam/-lpam -laudit/' configure ''; nativeBuildInputs = [ bison ]; diff --git a/pkgs/tools/security/doas/disable-shared.patch b/pkgs/tools/security/doas/disable-shared.patch new file mode 100644 index 0000000000000..2f8869ee69884 --- /dev/null +++ b/pkgs/tools/security/doas/disable-shared.patch @@ -0,0 +1,13 @@ +Accept and ignore "--disable-shared" option passed by pkgsStatic.stdenv. +Without this patch, configure phase fails with "unknown option". + +--- a/configure 1970-01-01 00:00:00.000000000 -0500 ++++ b/configure 1970-01-01 00:00:00.000000000 -0500 +@@ -46,6 +46,7 @@ + opt=${x%%=*} + var=${x#*=} + case "$opt" in ++ --disable-shared) : ;; + --prefix) PREFIX=$var ;; + --exec-prefix) EPREFIX=$var ;; + --bindir) BINDIR=$var ;; |