From 43ec75d47083ae4e35ebad14e25dd6249c19f44f Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 28 Feb 2020 12:09:54 -0800
Subject: ipmitool: cleanup expression

* remove no-op substitution of s6_addr16 -> s6_addr

This string doesn't exist anymore in that file.

* clean up configureFlags
---
 pkgs/tools/system/ipmitool/default.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'pkgs/tools/system')

diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix
index e86dc14b0201..75bfd7126613 100644
--- a/pkgs/tools/system/ipmitool/default.nix
+++ b/pkgs/tools/system/ipmitool/default.nix
@@ -19,19 +19,19 @@ stdenv.mkDerivation {
     })
   ];
 
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
-    substituteInPlace src/plugins/ipmi_intf.c --replace "s6_addr16" "s6_addr"
-  '';
-
   buildInputs = [ openssl ];
 
-  preConfigure = ''
-    configureFlagsArray=(
-      --infodir=$out/share/info
-      --mandir=$out/share/man
-      ${if static then "LDFLAGS=-static --enable-static --disable-shared" else "--enable-shared"}
-    )
-  '';
+  configureFlags = [
+    "--infodir=${placeholder "out"}/share/info"
+    "--mandir=${placeholder "out"}/share/man"
+  ] ++ stdenv.lib.optionals static [
+    "LDFLAGS=-static"
+    "--enable-static"
+    "--disable-shared"
+  ] ++ stdenv.lib.optionals (!static) [
+    "--enable-shared"
+  ];
+
   makeFlags = stdenv.lib.optional static "AM_LDFLAGS=-all-static";
   dontDisableStatic = static;
 
-- 
cgit 1.4.1