lol

doas: drop patch, use dontAddStaticConfigureFlags instead

The configure script that comes with doas does not understand
`--disable-shared`, which nixpkgs sometimes adds to
`configureFlags`.

Previously, doas included a patch that would cause its configure
script to ignore this flag instead of rejecting it. This commit
drops that patch and instead uses
`dontAddStaticConfigureFlags=false` (introduced in
b0b5ef7286dca098f40f5075175105c3c0dfbe05) to prevent nixpkgs addingn
`--disable-shared` to doas' configureFlags.

authored by

Adam Joseph and committed by helbling.dev e2c55579 92777e64

+3 -18
+3 -5
pkgs/tools/security/doas/default.nix
··· 32 32 # Allow doas to discover binaries in /run/current-system/sw/{s,}bin and 33 33 # /run/wrappers/bin 34 34 ./0001-add-NixOS-specific-dirs-to-safe-PATH.patch 35 - 36 - # Standard environment supports "dontDisableStatic" knob, but has no 37 - # equivalent for "--disable-shared", so I have to patch "configure" 38 - # script instead. 39 - ./disable-shared.patch 40 35 ]; 36 + 37 + # ./configure script does not understand `--disable-shared` 38 + dontAddStaticConfigureFlags = true; 41 39 42 40 postPatch = '' 43 41 sed -i '/\(chown\|chmod\)/d' GNUmakefile
-13
pkgs/tools/security/doas/disable-shared.patch
··· 1 - Accept and ignore "--disable-shared" option passed by pkgsStatic.stdenv. 2 - Without this patch, configure phase fails with "unknown option". 3 - 4 - --- a/configure 1970-01-01 00:00:00.000000000 -0500 5 - +++ b/configure 1970-01-01 00:00:00.000000000 -0500 6 - @@ -46,6 +46,7 @@ 7 - opt=${x%%=*} 8 - var=${x#*=} 9 - case "$opt" in 10 - + --disable-shared) : ;; 11 - --prefix) PREFIX=$var ;; 12 - --exec-prefix) EPREFIX=$var ;; 13 - --bindir) BINDIR=$var ;;