dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

ipmitool: cleanup expression

Browse Source 
* remove no-op substitution of s6_addr16 -> s6_addr

This string doesn't exist anymore in that file.

* clean up configureFlags
This commit is contained in:
Florian Klink 2020-02-28 12:09:54 -08:00 committed by worldofpeace
parent ad19bb5ff8
commit 43ec75d470
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/tools/system/ipmitool/default.nix
View File

@ -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 ]; buildInputs = [ openssl ];
preConfigure = '' configureFlags = [
configureFlagsArray=( "--infodir=${placeholder "out"}/share/info"
--infodir=$out/share/info "--mandir=${placeholder "out"}/share/man"
--mandir=$out/share/man ] ++ stdenv.lib.optionals static [
${if static then "LDFLAGS=-static --enable-static --disable-shared" else "--enable-shared"} "LDFLAGS=-static"
) "--enable-static"
''; "--disable-shared"
] ++ stdenv.lib.optionals (!static) [
"--enable-shared"
];
makeFlags = stdenv.lib.optional static "AM_LDFLAGS=-all-static"; makeFlags = stdenv.lib.optional static "AM_LDFLAGS=-all-static";
dontDisableStatic = static; dontDisableStatic = static;