From 4e7384feb29ee3c38a6a012ebb719483b8cb3434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Mon, 1 Dec 2025 11:17:01 -0600 Subject: [PATCH] db{48,53,60,62}: get gentoo patch for gcc15 and Wno-error=incompatible-pointer-types --- pkgs/development/libraries/db/db-4.8.nix | 1 + pkgs/development/libraries/db/db-5.3.nix | 1 + pkgs/development/libraries/db/db-6.0.nix | 1 + pkgs/development/libraries/db/db-6.2.nix | 1 + pkgs/development/libraries/db/generic.nix | 14 +++++++++++++- 5 files changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/db/db-4.8.nix b/pkgs/development/libraries/db/db-4.8.nix index b91ec5dd5b6a..23ed07441755 100644 --- a/pkgs/development/libraries/db/db-4.8.nix +++ b/pkgs/development/libraries/db/db-4.8.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchpatch, fetchurl, autoreconfHook, ... diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix index 77e9a1a04269..c9e1a6bb1d1e 100644 --- a/pkgs/development/libraries/db/db-5.3.nix +++ b/pkgs/development/libraries/db/db-5.3.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchpatch, fetchurl, autoreconfHook, ... diff --git a/pkgs/development/libraries/db/db-6.0.nix b/pkgs/development/libraries/db/db-6.0.nix index f720ca180639..a23ee5b936fc 100644 --- a/pkgs/development/libraries/db/db-6.0.nix +++ b/pkgs/development/libraries/db/db-6.0.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchpatch, fetchurl, autoreconfHook, ... diff --git a/pkgs/development/libraries/db/db-6.2.nix b/pkgs/development/libraries/db/db-6.2.nix index 2f573aaca1e9..78c6cf4eb8a7 100644 --- a/pkgs/development/libraries/db/db-6.2.nix +++ b/pkgs/development/libraries/db/db-6.2.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchpatch, fetchurl, autoreconfHook, ... diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index cbe36d489d9f..eb59a7e4b941 100644 --- a/pkgs/development/libraries/db/generic.nix +++ b/pkgs/development/libraries/db/generic.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchpatch, fetchurl, autoreconfHook, cxxSupport ? true, @@ -29,7 +30,14 @@ stdenv.mkDerivation ( # configure checks to work incorrectly with clang 16. nativeBuildInputs = [ autoreconfHook ]; - patches = extraPatches; + patches = [ + (fetchpatch { + name = "gcc15.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-libs/db/files/db-4.8.30-tls-configure.patch?id=1ae36006c79ef705252f5f7009e79f6add7dc353"; + hash = "sha256-OzQL+kgXtcvhvyleDLuH1abhY4Shb/9IXx4ZkeFbHOA="; + }) + ] + ++ extraPatches; outputs = [ "bin" @@ -75,6 +83,10 @@ stdenv.mkDerivation ( popd ''; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=incompatible-pointer-types" + ]; + configureFlags = [ (if cxxSupport then "--enable-cxx" else "--disable-cxx") (if compat185 then "--enable-compat185" else "--disable-compat185")