From 62e24cdb9bf5b3795050bb71e444c6762b6409ef Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 26 Nov 2024 20:14:27 +0100 Subject: [PATCH] iproute2: fix build for musl These patches were removed when iproute2 was updated, but are still necessary. (They fix implicit function declarations, which are an error with GCC 14.) Fixes: e74ce644d04b ("iproute2: 6.11.0 -> 6.12.0") --- pkgs/by-name/ip/iproute2/package.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/by-name/ip/iproute2/package.nix b/pkgs/by-name/ip/iproute2/package.nix index 6ca8651c9a4c..cd9ca84ee08d 100644 --- a/pkgs/by-name/ip/iproute2/package.nix +++ b/pkgs/by-name/ip/iproute2/package.nix @@ -13,6 +13,19 @@ stdenv.mkDerivation rec { hash = "sha256-u9FB73tdASfMIVKEO6YfJ03DKBT6Pg8T59B6CAvvU9k="; }; + patches = [ + (fetchurl { + name = "musl-endian.patch"; + url = "https://lore.kernel.org/netdev/20240712191209.31324-1-contact@hacktivis.me/raw"; + hash = "sha256-MX+P+PSEh6XlhoWgzZEBlOV9aXhJNd20Gi0fJCcSZ5E="; + }) + (fetchurl { + name = "musl-basename.patch"; + url = "https://lore.kernel.org/netdev/20240804161054.942439-1-dilfridge@gentoo.org/raw"; + hash = "sha256-47obv6mIn/HO47lt47slpTAFDxiQ3U/voHKzIiIGCTM="; + }) + ]; + postPatch = '' substituteInPlace Makefile \ --replace "CC := gcc" "CC ?= $CC"