From 8ae6b06dc99b5a2c5310fcdb47c08a9bad43c76d Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman Date: Sat, 1 Mar 2025 22:31:05 +0000 Subject: [PATCH] lzwolf: drop Quote from upstream [1]: > Unfortunately, LZWolf's development has been discontinued as of the > 5th of March, 2023. The engine is still a fantastic source port for the > building of mods, with a lot of cool features to take advantage of, but > will not be following ECWolf to a 1.4 release. The packaging is also unmaintained on our side and sources require patches to even compile with gcc >= 13. [1]: https://beta.wolf3d.net/engines/LZWolf --- pkgs/by-name/sd/SDL2_mixer_2_0/package.nix | 4 - pkgs/games/lzwolf/default.nix | 92 ---------------------- pkgs/top-level/aliases.nix | 2 +- pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 99 deletions(-) delete mode 100644 pkgs/games/lzwolf/default.nix diff --git a/pkgs/by-name/sd/SDL2_mixer_2_0/package.nix b/pkgs/by-name/sd/SDL2_mixer_2_0/package.nix index a886e85d5a9e..96b3d40f10fb 100644 --- a/pkgs/by-name/sd/SDL2_mixer_2_0/package.nix +++ b/pkgs/by-name/sd/SDL2_mixer_2_0/package.nix @@ -1,9 +1,7 @@ -# SDL2_mixer_2_0 pinned for lzwolf { SDL2_mixer, fetchFromGitHub, fetchpatch, - lzwolf, timidity, }: @@ -34,8 +32,6 @@ let substituteInPlace timidity/options.h \ --replace "/usr/share/timidity" "${timidity}/share/timidity" ''; - - passthru.tests.lzwolf = lzwolf; }; in SDL2_mixer.overrideAttrs (_: attrset) diff --git a/pkgs/games/lzwolf/default.nix b/pkgs/games/lzwolf/default.nix deleted file mode 100644 index 9537d959253e..000000000000 --- a/pkgs/games/lzwolf/default.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ - stdenv, - lib, - fetchFromBitbucket, - fetchpatch, - p7zip, - cmake, - SDL2, - bzip2, - zlib, - libjpeg, - libsndfile, - mpg123, - pkg-config, - SDL2_net, - SDL2_mixer, -}: - -stdenv.mkDerivation rec { - pname = "lzwolf"; - # Fix-Me: Remember to remove SDL2_mixer pin (at top-level) on next lzwolf upgrade. - version = "unstable-2022-12-26"; - - src = fetchFromBitbucket { - owner = "linuxwolf6"; - repo = "lzwolf"; - rev = "a24190604296e16941c601b57afe4350462fc659"; - hash = "sha256-CtBdvk6LXb/ll92Fxig/M4t4QNj8dNFJYd8F99b47kQ="; - }; - - patches = [ - # Pull fix pending upstream inclusion for `gcc-13` support: - # https://bitbucket.org/linuxwolf6/lzwolf/pull-requests/5 - (fetchpatch { - name = "gcc-13.patch"; - 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 = '' - # SDL2_net-2.2.0 changed CMake component name slightly. - substituteInPlace src/CMakeLists.txt \ - --replace 'SDL2::SDL2_net' 'SDL2_net::SDL2_net' - ''; - - nativeBuildInputs = [ - p7zip - pkg-config - cmake - ]; - buildInputs = [ - SDL2 - bzip2 - zlib - libjpeg - SDL2_mixer - SDL2_net - libsndfile - mpg123 - ]; - - cmakeFlags = [ - "-DGPL=ON" - ]; - - doCheck = true; - - installPhase = '' - install -Dm755 lzwolf "$out/lib/lzwolf/lzwolf" - for i in *.pk3; do - install -Dm644 "$i" "$out/lib/lzwolf/$i" - done - mkdir -p $out/bin - ln -s $out/lib/lzwolf/lzwolf $out/bin/lzwolf - ''; - - meta = with lib; { - homepage = "https://bitbucket.org/linuxwolf6/lzwolf"; - description = "Enhanced fork of ECWolf, a Wolfenstein 3D source port"; - mainProgram = "lzwolf"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1a516fa3850c..abca1569ecf3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -903,7 +903,7 @@ mapAliases { lxd = lib.warnOnInstantiate "lxd has been renamed to lxd-lts" lxd-lts; # Added 2024-04-01 lxd-unwrapped = lib.warnOnInstantiate "lxd-unwrapped has been renamed to lxd-unwrapped-lts" lxd-unwrapped-lts; # Added 2024-04-01 lzma = throw "'lzma' has been renamed to/replaced by 'xz'"; # Converted to throw 2024-10-17 - + lzwolf = throw "'lzwolf' has been removed because it's no longer maintained upstream. Consider using 'ecwolf'"; # Added 2025-03-02 ### M ### ma1sd = throw "ma1sd was dropped as it is unmaintained"; # Added 2024-07-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8da5800d902..944ac2d922e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4137,8 +4137,6 @@ with pkgs; xz = callPackage ../tools/compression/xz { }; - lzwolf = callPackage ../games/lzwolf { SDL2_mixer = SDL2_mixer_2_0; }; - madlang = haskell.lib.compose.justStaticExecutables haskellPackages.madlang; mailnag = callPackage ../applications/networking/mailreaders/mailnag {