about summary refs log tree commit diff
path: root/pkgs/tools/networking/iperf
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2018-02-21 12:35:59 -0600
committerWill Dietz <w@wdtz.org>2018-02-21 12:35:59 -0600
commitba886553284251954cdea999116aa6b055360878 (patch)
treeed932b01d79694359413f0fbf3826e3b0b0fdce3 /pkgs/tools/networking/iperf
parent539f26cb39c16f5e365753eee80a3bd369fc8001 (diff)
iperf3: remove upstreamed patches and workarounds (musl)
Diffstat (limited to 'pkgs/tools/networking/iperf')
-rw-r--r--pkgs/tools/networking/iperf/3.nix11
1 files changed, 1 insertions, 10 deletions
diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix
index 8b7187f07c762..28b53a8c24778 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