From 44b853f7ecba76797037e3ad08c3bc6d58d6c9a0 Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Wed, 23 Jul 2025 12:43:41 -0700
Subject: [PATCH] nmh: refactor

---
 pkgs/by-name/nm/nmh/package.nix | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/nm/nmh/package.nix b/pkgs/by-name/nm/nmh/package.nix
index 42c92b00db0e..4b92436f02d7 100644
--- a/pkgs/by-name/nm/nmh/package.nix
+++ b/pkgs/by-name/nm/nmh/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   autoreconfHook,
   bison,
-  coreutils,
   cyrus_sasl,
   db,
   fetchurl,
@@ -28,16 +27,20 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [ ./reproducible-build-date.patch ];
 
-  postPatch = ''
-    substituteInPlace \
-      sbr/arglist.c \
-      uip/mhbuildsbr.c \
-      uip/whatnowsbr.c \
-      uip/slocal.c \
-      --replace-fail '"/bin/sh"' '"${runtimeShell}"'
+  postPatch =
+    # patch hardcoded shell
+    ''
+      substituteInPlace \
+        sbr/arglist.c \
+        uip/mhbuildsbr.c \
+        uip/whatnowsbr.c \
+        uip/slocal.c \
+        --replace-fail '"/bin/sh"' '"${runtimeShell}"'
+    ''
     # the "cleanup" pseudo-test makes diagnosing test failures a pain
-    ln -s -f ${stdenv}/bin/true test/cleanup
-  '';
+    + ''
+      ln -sf ${stdenv}/bin/true test/cleanup
+    '';
 
   nativeBuildInputs = [
     autoreconfHook
@@ -55,7 +58,6 @@ stdenv.mkDerivation (finalAttrs: {
     readline
   ];
 
-  NIX_CFLAGS_COMPILE = "-Wno-stringop-truncation";
   doCheck = true;
   enableParallelBuilding = true;