diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2022-05-30 21:55:03 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-30 21:55:03 +0000 |
| commit | facee525a19ab06e5de171d8566baa1a7e3af6d8 (patch) | |
| tree | 024dc4d366b47790a336d0a17c48c1f1e669cb3e /pkgs/applications | |
| parent | d244b4a9a2dcd2002f9a7fb29f5c6c558a321016 (diff) | |
| parent | a4774b5b1b6ee17908c456727eb22d3508c8fe84 (diff) | |
| download | nixpkgs-facee525a19ab06e5de171d8566baa1a7e3af6d8.tar nixpkgs-facee525a19ab06e5de171d8566baa1a7e3af6d8.tar.gz nixpkgs-facee525a19ab06e5de171d8566baa1a7e3af6d8.tar.bz2 nixpkgs-facee525a19ab06e5de171d8566baa1a7e3af6d8.tar.lz nixpkgs-facee525a19ab06e5de171d8566baa1a7e3af6d8.tar.xz nixpkgs-facee525a19ab06e5de171d8566baa1a7e3af6d8.tar.zst nixpkgs-facee525a19ab06e5de171d8566baa1a7e3af6d8.zip | |
Merge pull request #174017 from trofi/fix-fno-common-for-netperf
netperf: pull patch pending upstream inclusion for -fno-common toolch…
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/netperf/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix index 880ebdd2d4e..7722ab479c5 100644 --- a/pkgs/applications/networking/netperf/default.nix +++ b/pkgs/applications/networking/netperf/default.nix @@ -1,4 +1,4 @@ -{ libsmbios, lib, stdenv, autoreconfHook, fetchFromGitHub }: +{ libsmbios, lib, stdenv, autoreconfHook, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation { pname = "netperf"; @@ -11,6 +11,16 @@ stdenv.mkDerivation { sha256 = "s4G1ZN+6LERdEMDkc+12ZQgTi6K+ppUYUCGn4faCS9c="; }; + patches = [ + # Pul fix pending upstream inclusion for -fno-common toolchains: + # https://github.com/HewlettPackard/netperf/pull/46 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/HewlettPackard/netperf/commit/c6a2e17fe35f0e68823451fedfdf5b1dbecddbe3.patch"; + sha256 = "P/lRa6EakSalKWDTgZ7bWeGleaTLLa5UhzulxKd1xE4="; + }) + ]; + buildInputs = lib.optional (with stdenv.hostPlatform; isx86 && isLinux) libsmbios; nativeBuildInputs = [ autoreconfHook ]; autoreconfPhase = '' |