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

Merge pull request #62610 from Profpatsch/iperf3-symlink-manpage

Browse Source 
iperf3: symlink manpage to iperf & split man output
This commit is contained in:
Franz Pletz 2019-06-08 08:21:51 +00:00 committed by GitHub
commit 3b58c7206b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/tools/networking/iperf/2.nix
View File

@ -11,10 +11,18 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
configureFlags = [ "--enable-fastsampling" ]; configureFlags = [ "--enable-fastsampling" ];
postInstall = ''
mv $out/bin/iperf $out/bin/iperf2
ln -s $out/bin/iperf2 $out/bin/iperf
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://sourceforge.net/projects/iperf/; homepage = https://sourceforge.net/projects/iperf/;
description = "Tool to measure IP bandwidth using UDP or TCP"; description = "Tool to measure IP bandwidth using UDP or TCP";
platforms = platforms.unix; platforms = platforms.unix;
license = licenses.mit; license = licenses.mit;
# prioritize iperf3
priority = 10;
}; };
} }

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

@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
buildInputs = [ openssl ]; buildInputs = [ openssl ];
outputs = [ "out" "man" ];
patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [
(fetchpatch { (fetchpatch {
url = "https://git.alpinelinux.org/aports/plain/main/iperf3/remove-pg-flags.patch?id=99ec9e1c84e338629cf1b27b0fdc808bde4d8564"; url = "https://git.alpinelinux.org/aports/plain/main/iperf3/remove-pg-flags.patch?id=99ec9e1c84e338629cf1b27b0fdc808bde4d8564";
@ -19,7 +21,8 @@ stdenv.mkDerivation rec {
]; ];
postInstall = '' 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; { meta = with stdenv.lib; {