pyrox.dev / nixpkgs
lol
fork atom

Merge staging-next into staging

authored by github-actions[bot] and committed by GitHub 2ca4ddc9 aa1b867e

+11
unified split
+11
pkgs/tools/misc/ethtool/default.nix
··· 1 { lib 2 , stdenv 3 , fetchurl 4 , libmnl 5 , pkg-config 6 , writeScript ··· 14 url = "mirror://kernel/software/network/${pname}/${pname}-${version}.tar.xz"; 15 sha256 = "sha256-xB/Igf+lpAQy0t2CnrRMZKSd7kgucWuqz5Jixk2qj5A="; 16 }; 17 18 nativeBuildInputs = [ 19 pkg-config
··· 1 { lib 2 , stdenv 3 , fetchurl 4 + , fetchpatch 5 , libmnl 6 , pkg-config 7 , writeScript ··· 15 url = "mirror://kernel/software/network/${pname}/${pname}-${version}.tar.xz"; 16 sha256 = "sha256-xB/Igf+lpAQy0t2CnrRMZKSd7kgucWuqz5Jixk2qj5A="; 17 }; 18 + 19 + patches = [ 20 + # Patch that fixes build with musl libc 21 + # NOTE remove on next release, since it is applied in upstream 22 + (fetchpatch { 23 + name = "Fix-build-with-musl-libc.patch"; 24 + url = "https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/patch/marvell.c?id=41be533331fc3c6b711dbe532405782d3b8be5d1"; 25 + sha256 = "sha256-CItvt/eeNJkr1sOzaaHZhAnaybDutL9cT2O6XwQll+M="; 26 + }) 27 + ]; 28 29 nativeBuildInputs = [ 30 pkg-config