From ba886553284251954cdea999116aa6b055360878 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 21 Feb 2018 12:35:59 -0600 Subject: [PATCH] iperf3: remove upstreamed patches and workarounds (musl) --- pkgs/tools/networking/iperf/3.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix index 8b7187f07c76..28b53a8c2477 100644 --- a/pkgs/tools/networking/iperf/3.nix +++ b/pkgs/tools/networking/iperf/3.nix @@ -10,22 +10,13 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; - preConfigure = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' - NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE" - ''; - 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 { url = "http://git.alpinelinux.org/cgit/aports/plain/main/iperf3/remove-pg-flags.patch"; name = "remove-pg-flags.patch"; sha256 = "0lnczhass24kgq59drgdipnhjnw4l1cy6gqza7f2ah1qr4q104rm"; }) -]; + ]; postInstall = '' ln -s iperf3 $out/bin/iperf