From f3d97d08233f0db47e56a078f13ed1eaebcb0b7a Mon Sep 17 00:00:00 2001
From: Leah Amelia Chen <hi@pluie.me>
Date: Sun, 18 May 2025 00:16:09 +0200
Subject: [PATCH] fvwm2: fix build with GCC 14 ZHF #403336

---
 pkgs/by-name/fv/fvwm2/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/fv/fvwm2/package.nix b/pkgs/by-name/fv/fvwm2/package.nix
index 52b9f2059022..8f541fca0e75 100644
--- a/pkgs/by-name/fv/fvwm2/package.nix
+++ b/pkgs/by-name/fv/fvwm2/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fvwmorg";
     repo = "fvwm";
-    rev = version;
+    tag = version;
     hash = "sha256-KcuX8las1n8UUE/BOHj7WOeZjva5hxgpFHtATMUk3bg=";
   };
 
@@ -67,6 +67,10 @@ stdenv.mkDerivation rec {
     "--disable-htmldoc"
   ];
 
+  # Fix build on GCC 14 (see https://github.com/fvwmorg/fvwm/pull/100)
+  # Will never be accepted as an upstream patch as FVWM2 is EOL
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=int-conversion -Wno-error=incompatible-pointer-types";
+
   postFixup = ''
     wrapPythonPrograms
   '';