From 6d437cab4c63195038cf17880ad15e31fd0bde49 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sat, 21 Mar 2026 23:25:32 -0700 Subject: [PATCH] uucp: fix build with GCC 14+/15+ --- pkgs/by-name/uu/uucp/package.nix | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/uu/uucp/package.nix b/pkgs/by-name/uu/uucp/package.nix index c32f40589ad9..4a988fdb5652 100644 --- a/pkgs/by-name/uu/uucp/package.nix +++ b/pkgs/by-name/uu/uucp/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchDebianPatch, autoreconfHook, testers, }: @@ -22,14 +23,28 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace Makefile.am \ --replace-fail 4555 0555 sed -i '/chown $(OWNER)/d' Makefile.am - - # don't reply on implicitly defined `exit` function in `HAVE_VOID` test: - substituteInPlace configure.in \ - --replace-fail '(void) exit (0)' '(void) (0)' ''; patches = [ ./socklen_t.patch + (fetchDebianPatch { + inherit (finalAttrs) pname version; + debianRevision = "31"; + patch = "configure.patch"; + hash = "sha256-6Aqghz6P+bWULHOXCQIdQLRuaE+Lci7t5ojQXJOyeA0="; + }) + (fetchDebianPatch { + inherit (finalAttrs) pname version; + debianRevision = "31"; + patch = "implicit.patch"; + hash = "sha256-EsJqZCV4x7ggzpoa4OaibCLvF8L8FGGnLlBtr4Cee18="; + }) + (fetchDebianPatch { + inherit (finalAttrs) pname version; + debianRevision = "31"; + patch = "gcc15.patch"; + hash = "sha256-+9H/gQLwkPx4GeWiZyy6oQdysvw2+P1O8wP5It/Tg5k="; + }) ]; # Regenerate `configure`; the checked in version was generated in 2002 and