From b803189674cb5c15a5730dafa951208951749700 Mon Sep 17 00:00:00 2001 From: Colin Date: Sat, 25 May 2024 21:22:22 +0000 Subject: [PATCH] pam: packaging cleanups - don't set null postPatch - remove unnecessary musl patch null postPatch breaks common override idioms like ```nix pam.overrideAttrs (attrs: { postPatch = (attrs.postPatch or "") + "..."; }); ``` the musl patch was upstreamed into pam and subsequently removed from Alpine (where we took it from) --- pkgs/os-specific/linux/pam/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index e5f8fec5acb1..b460348a105d 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { ]; # Case-insensitivity workaround for https://github.com/linux-pam/linux-pam/issues/569 - postPatch = if stdenv.buildPlatform.isDarwin && stdenv.buildPlatform != stdenv.hostPlatform then '' + postPatch = lib.optionalString (stdenv.buildPlatform.isDarwin && stdenv.buildPlatform != stdenv.hostPlatform) '' rm CHANGELOG touch ChangeLog - '' else null; + ''; outputs = [ "out" "doc" "man" /* "modules" */ ]; @@ -36,14 +36,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - preConfigure = lib.optionalString (stdenv.hostPlatform.libc == "musl") '' - # export ac_cv_search_crypt=no - # (taken from Alpine linux, apparently insecure but also doesn't build O:)) - # disable insecure modules - # sed -e 's/pam_rhosts//g' -i modules/Makefile.am - sed -e 's/pam_rhosts//g' -i modules/Makefile.in - ''; - configureFlags = [ "--includedir=${placeholder "out"}/include/security" "--enable-sconfigdir=/etc/security"