diff options
| author | Yureka <yuka@yuka.dev> | 2023-02-12 19:35:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-12 19:35:18 +0100 |
| commit | 15f0d4ccd57e88ccadbaa92582f23c25e81fa9e1 (patch) | |
| tree | 24e2cb035a28ce7d0e3f063a72bafb18363bcce0 | |
| parent | Merge master into staging-next (diff) | |
| download | nixpkgs-15f0d4ccd57e88ccadbaa92582f23c25e81fa9e1.tar.gz | |
ethtool: apply upstream diff to fix build on musl (#216011)
| -rw-r--r-- | pkgs/tools/misc/ethtool/default.nix | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index 08424a37d5f9..5850fada2a70 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , libmnl , pkg-config , writeScript @@ -15,6 +16,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-xB/Igf+lpAQy0t2CnrRMZKSd7kgucWuqz5Jixk2qj5A="; }; + patches = [ + # Patch that fixes build with musl libc + # NOTE remove on next release, since it is applied in upstream + (fetchpatch { + name = "Fix-build-with-musl-libc.patch"; + url = "https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/patch/marvell.c?id=41be533331fc3c6b711dbe532405782d3b8be5d1"; + sha256 = "sha256-CItvt/eeNJkr1sOzaaHZhAnaybDutL9cT2O6XwQll+M="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; |