From 752ea94f23a308fdb6f60e66785e8cb1938db74c Mon Sep 17 00:00:00 2001 From: Xiangyan Sun Date: Tue, 5 May 2026 22:07:51 -0700 Subject: [PATCH] mrtg: fix build with gcc15 --- pkgs/by-name/mr/mrtg/package.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mr/mrtg/package.nix b/pkgs/by-name/mr/mrtg/package.nix index 0b05834ba47b..a7adb44cb92c 100644 --- a/pkgs/by-name/mr/mrtg/package.nix +++ b/pkgs/by-name/mr/mrtg/package.nix @@ -3,6 +3,7 @@ stdenv, makeWrapper, fetchurl, + fetchpatch, perl, gd, rrdtool, @@ -38,10 +39,18 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # gcc14 broke detection of printf format specifiers # building from master seems to be fixed upstream, so next release can (likely) drop the patch - # just keep the CFLAGS below ./configure-long-long-format-gcc14.patch + # fix gcc15 build, remove after next release + (fetchpatch { + name = "fix-gcc15.patch"; + url = "https://github.com/oetiker/mrtg/commit/a64a83210643114b3a892e70ce07ded5bd5de054.patch"; + hash = "sha256-9k16WrCAETuk5DJf5pmeXFHc4AZD9Acmtq/7P24tpwc="; + excludes = [ "CHANGES" ]; + stripLen = 2; + extraPrefix = ""; + }) ]; - env.NIX_CFLAGS_COMPILE = "-Werror"; + env.NIX_CFLAGS_LINK = "-lm"; postInstall = ''