public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #35284 from dtzWill/feature/iperf3-simplify 

iperf3: remove upstreamed patches and workarounds (musl)
This commit is contained in:
Will Dietz 2018-02-21 12:53:52 -06:00 committed by GitHub
parent 539f26cb39 ba88655328
commit 5290e19bc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/tools/networking/iperf/3.nix
View File

@ -10,22 +10,13 @@ stdenv.mkDerivation rec {
buildInputs = [ openssl ]; buildInputs = [ openssl ];
preConfigure = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE"
'';
patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [
(fetchpatch {
url = "http://git.alpinelinux.org/cgit/aports/plain/main/iperf3/build-fixes.patch";
name = "fix-musl-build.patch";
sha256 = "0zvfjnqdldh6rc6qggyb310swdnl9qk0m3z1kklnqzgjsh8dskvl";
})
(fetchpatch { (fetchpatch {
url = "http://git.alpinelinux.org/cgit/aports/plain/main/iperf3/remove-pg-flags.patch"; url = "http://git.alpinelinux.org/cgit/aports/plain/main/iperf3/remove-pg-flags.patch";
name = "remove-pg-flags.patch"; name = "remove-pg-flags.patch";
sha256 = "0lnczhass24kgq59drgdipnhjnw4l1cy6gqza7f2ah1qr4q104rm"; sha256 = "0lnczhass24kgq59drgdipnhjnw4l1cy6gqza7f2ah1qr4q104rm";
}) })
]; ];
postInstall = '' postInstall = ''
ln -s iperf3 $out/bin/iperf ln -s iperf3 $out/bin/iperf