diff options
| author | Florian Klink <flokli@flokli.de> | 2020-02-28 12:09:54 -0800 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2020-03-01 08:49:29 -0500 |
| commit | 43ec75d47083ae4e35ebad14e25dd6249c19f44f (patch) | |
| tree | 47e9d55747cd8a2dbef5aa19602882588032aae8 /pkgs/tools/system | |
| parent | ad19bb5ff849dfa9af2ad52afda361198391db43 (diff) | |
| download | nixlib-43ec75d47083ae4e35ebad14e25dd6249c19f44f.tar nixlib-43ec75d47083ae4e35ebad14e25dd6249c19f44f.tar.gz nixlib-43ec75d47083ae4e35ebad14e25dd6249c19f44f.tar.bz2 nixlib-43ec75d47083ae4e35ebad14e25dd6249c19f44f.tar.lz nixlib-43ec75d47083ae4e35ebad14e25dd6249c19f44f.tar.xz nixlib-43ec75d47083ae4e35ebad14e25dd6249c19f44f.tar.zst nixlib-43ec75d47083ae4e35ebad14e25dd6249c19f44f.zip | |
ipmitool: cleanup expression
* remove no-op substitution of s6_addr16 -> s6_addr This string doesn't exist anymore in that file. * clean up configureFlags
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/ipmitool/default.nix | 22 |
1 files changed, 11 insertions, 11 deletions
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; |