{ecwolf,lzwolf}: fix build with gcc-14, cleanup (#368178)

pkgs/by-name/ec/ecwolf/package.nix

@@ -15,19 +15,29 @@
   writers,
   python3Packages,
   nix-update,
+  fetchpatch,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ecwolf";
   version = "1.4.1";
 
   src = fetchFromBitbucket {
-    owner = pname;
-    repo = pname;
-    rev = version;
-    sha256 = "V2pSP8i20zB50WtUMujzij+ISSupdQQ/oCYYrOaTU1g=";
+    owner = "ecwolf";
+    repo = "ecwolf";
+    rev = "refs/tags/${finalAttrs.version}";
+    hash = "sha256-V2pSP8i20zB50WtUMujzij+ISSupdQQ/oCYYrOaTU1g=";
   };
 
+  patches = [
+    # Fixes build with gcc >= 14. Shouldn't be needed for ecwolf versions > 1.4.1.
+    (fetchpatch {
+      name = "tmemory.h-const-correctness.patch";
+      url = "https://bitbucket.org/ecwolf/ecwolf/commits/400aaf96a36a14ab8eab18a670ba6439046f3bb0/raw";
+      hash = "sha256-2YwHEctBPyprs0DVsazimGEgmiCba24zh2dFfw9tOnU=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -105,4 +115,4 @@ stdenv.mkDerivation rec {
     ];
     platforms = platforms.all;
   };
-}
+})

pkgs/games/lzwolf/default.nix

@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     owner = "linuxwolf6";
     repo = "lzwolf";
     rev = "a24190604296e16941c601b57afe4350462fc659";
-    sha256 = "sha256-CtBdvk6LXb/ll92Fxig/M4t4QNj8dNFJYd8F99b47kQ=";
+    hash = "sha256-CtBdvk6LXb/ll92Fxig/M4t4QNj8dNFJYd8F99b47kQ=";
   };
 
   patches = [
@@ -36,6 +36,12 @@ stdenv.mkDerivation rec {
       url = "https://bitbucket.org/soturi/lzwolf/commits/41f212026dff4f089d1c0921cb49ab1a2b81e0d6/raw";
       hash = "sha256-EgSdDaZovD7DyZ0BkuX8ZdsrX7J7v8/D6y5P1NWGJew=";
     })
+    # Fixes build with gcc >= 14. Picked patch from the original ecwolf repo.
+    (fetchpatch {
+      name = "tmemory.h-const-correctness.patch";
+      url = "https://bitbucket.org/ecwolf/ecwolf/commits/400aaf96a36a14ab8eab18a670ba6439046f3bb0/raw";
+      hash = "sha256-2YwHEctBPyprs0DVsazimGEgmiCba24zh2dFfw9tOnU=";
+    })
   ];
 
   postPatch = ''