From aeb8fd1296eeb3d46d9c46ba5f127dc2beea7970 Mon Sep 17 00:00:00 2001
From: Jason Yundt <jason@jasonyundt.email>
Date: Thu, 19 Jan 2023 10:31:54 -0500
Subject: [PATCH 1/2] ecwolf: replace fetchurl with fetchFromBitbucket
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This change makes ecwolf’s src slightly simpler. It also makes ecwolf’s
src more future proof. When ECWolf 2.0 is released, the “1.x” in the
maniacsvault.net URL is likely to change, but the Bitbuck repo isn’t
likely to change. Additionally, this change reduces the difference
between ecwolf’s default.nix and lzwolf’s default.nix (LZWolf is a fork
of ECWolf). Finally, this change makes nixpkgs rely on bitbucket.org
instead of maniacsvault.net. bitbucket.org is probably more reliable
than maniacsvault.net.
---
 pkgs/games/ecwolf/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/ecwolf/default.nix b/pkgs/games/ecwolf/default.nix
index f8ca3b40f532..57fe97af614e 100644
--- a/pkgs/games/ecwolf/default.nix
+++ b/pkgs/games/ecwolf/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, lib, fetchurl, makeDesktopItem, copyDesktopItems, cmake, pkg-config, zlib, bzip2, libjpeg, SDL, SDL_mixer, gtk2 }:
+{ stdenv, lib, fetchFromBitbucket, makeDesktopItem, copyDesktopItems, cmake, pkg-config, zlib, bzip2, libjpeg, SDL, SDL_mixer, gtk2 }:
 
 stdenv.mkDerivation rec {
   pname = "ecwolf";
   version = "1.3.3";
 
-  src = fetchurl {
-    url = "https://maniacsvault.net/ecwolf/files/ecwolf/1.x/${pname}-${version}-src.tar.xz";
-    sha256 = "1sbdv672dz47la5a5qwmdi1v258k9kc5dkx7cdj2b6gk8nbm2srl";
+  src = fetchFromBitbucket {
+    owner = pname;
+    repo = pname;
+    rev = version;
+    sha256 = "7RjWoABZkN5J7GpG7ie7F3rSrI3Kp3I8KRalZAE92pQ=";
   };
 
   nativeBuildInputs = [ cmake copyDesktopItems pkg-config ];

From d0d65badfcb971d606e3982afb000a316214e46d Mon Sep 17 00:00:00 2001
From: Jason Yundt <jason@jasonyundt.email>
Date: Thu, 19 Jan 2023 10:59:41 -0500
Subject: [PATCH 2/2] ecwolf: 1.3.3 -> 1.4.0

Release announcement: <https://maniacsvault.net/entry91>

SDL and SDL_mixer had to be replaced with SDL2 and SDL2_mixer to get the
new version of ECWolf to compile. Also, SDL2_net had to be added since
ECWolf now has support for multiplayer (see
<https://maniacsvault.net/ecwolf/multiplayer.php>).

Closes #211388.
---
 pkgs/games/ecwolf/default.nix | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/ecwolf/default.nix b/pkgs/games/ecwolf/default.nix
index 57fe97af614e..505c76f38f94 100644
--- a/pkgs/games/ecwolf/default.nix
+++ b/pkgs/games/ecwolf/default.nix
@@ -1,18 +1,32 @@
-{ stdenv, lib, fetchFromBitbucket, makeDesktopItem, copyDesktopItems, cmake, pkg-config, zlib, bzip2, libjpeg, SDL, SDL_mixer, gtk2 }:
+{ stdenv
+, lib
+, fetchFromBitbucket
+, makeDesktopItem
+, copyDesktopItems
+, cmake
+, pkg-config
+, zlib
+, bzip2
+, libjpeg
+, SDL2
+, SDL2_net
+, SDL2_mixer
+, gtk2
+}:
 
 stdenv.mkDerivation rec {
   pname = "ecwolf";
-  version = "1.3.3";
+  version = "1.4.0";
 
   src = fetchFromBitbucket {
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "7RjWoABZkN5J7GpG7ie7F3rSrI3Kp3I8KRalZAE92pQ=";
+    sha256 = "n1G1zvfE1l42fbJ7ZaMdV0QXn45PjMpaaZTDQAOBtYk=";
   };
 
   nativeBuildInputs = [ cmake copyDesktopItems pkg-config ];
-  buildInputs = [ zlib bzip2 libjpeg SDL SDL_mixer gtk2 ];
+  buildInputs = [ zlib bzip2 libjpeg SDL2 SDL2_net SDL2_mixer gtk2 ];
 
   desktopItems = [
     (makeDesktopItem {
@@ -47,6 +61,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
+    broken = stdenv.isDarwin;
     description = "Enhanched SDL-based port of Wolfenstein 3D for various platforms";
     homepage = "https://maniacsvault.net/ecwolf/";
     license = licenses.gpl2Plus;