From a5a725041d9359ca3b9414b447464207c2a5ce92 Mon Sep 17 00:00:00 2001 From: Petr Zahradnik Date: Tue, 25 Mar 2025 23:43:16 +0100 Subject: [PATCH] netsurf.libdom: fix build on GCC 14 --- .../networking/browsers/netsurf/libdom.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/applications/networking/browsers/netsurf/libdom.nix b/pkgs/applications/networking/browsers/netsurf/libdom.nix index 015b5cec0321..43ac93f7c9db 100644 --- a/pkgs/applications/networking/browsers/netsurf/libdom.nix +++ b/pkgs/applications/networking/browsers/netsurf/libdom.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, expat, pkg-config, buildsystem, @@ -19,6 +20,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-0F5FrxZUcBTCsKOuzzZw+hPUGfUFs/X8esihSR/DDzw="; }; + patches = [ + # fixes libdom build on gcc 14 due to calloc-transposed-args warning + # remove on next release + (fetchpatch { + name = "fix-calloc-transposed-args.patch"; + url = "https://source.netsurf-browser.org/libdom.git/patch/?id=2687282d56dfef19e26e9639a5c0cd81de957e22"; + hash = "sha256-1uAdLM9foplCVu8IQlMMlXh6OWHs5eUgsKp+0ZqM9yM="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ @@ -34,6 +45,8 @@ stdenv.mkDerivation (finalAttrs: { "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; + enableParallelBuilding = true; + meta = { homepage = "https://www.netsurf-browser.org/projects/libdom/"; description = "Document Object Model library for netsurf browser";