From 347bf168da0066f5c3e8b1f592a5a97edd451879 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 3 Jun 2019 15:50:48 +0200 Subject: [PATCH 1/2] iperf3: symlink manpage to iperf & split man output Closes: https://github.com/NixOS/nixpkgs/issues/62255 --- pkgs/tools/networking/iperf/3.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix index 9082a484aa5..46e0154a004 100644 --- a/pkgs/tools/networking/iperf/3.nix +++ b/pkgs/tools/networking/iperf/3.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; + outputs = [ "out" "man" ]; + patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ (fetchpatch { url = "https://git.alpinelinux.org/aports/plain/main/iperf3/remove-pg-flags.patch?id=99ec9e1c84e338629cf1b27b0fdc808bde4d8564"; @@ -19,7 +21,8 @@ stdenv.mkDerivation rec { ]; postInstall = '' - ln -s iperf3 $out/bin/iperf + ln -s $out/bin/iperf3 $out/bin/iperf + ln -s $man/share/man/man1/iperf3.1 $man/share/man/man1/iperf.1 ''; meta = with stdenv.lib; { From ff132824f2ede76b8071c9350594122d92f9562a Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 4 Jun 2019 14:37:04 +0200 Subject: [PATCH 2/2] iperf2: make binary symlink & prioritize iperf3 If both are in the environment, iperf3 should be used as `bin/iperf` by default, for more consistency. --- pkgs/tools/networking/iperf/2.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/networking/iperf/2.nix b/pkgs/tools/networking/iperf/2.nix index 9faa0f95351..6494b907a3a 100644 --- a/pkgs/tools/networking/iperf/2.nix +++ b/pkgs/tools/networking/iperf/2.nix @@ -11,10 +11,18 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; configureFlags = [ "--enable-fastsampling" ]; + postInstall = '' + mv $out/bin/iperf $out/bin/iperf2 + ln -s $out/bin/iperf2 $out/bin/iperf + ''; + meta = with stdenv.lib; { homepage = https://sourceforge.net/projects/iperf/; description = "Tool to measure IP bandwidth using UDP or TCP"; platforms = platforms.unix; license = licenses.mit; + + # prioritize iperf3 + priority = 10; }; }