From 268daa475043df62503d8a4eeec1ca445a8480e6 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 1 Jun 2026 17:04:28 +0200
Subject: [PATCH] etlegacy-unwrapped: 2.83.2 -> 2.84.0

---
 .../by-name/et/etlegacy-unwrapped/package.nix | 26 ++++++++++++++++---
 pkgs/by-name/et/etlegacy/package.nix          | 15 +++++++++--
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/et/etlegacy-unwrapped/package.nix b/pkgs/by-name/et/etlegacy-unwrapped/package.nix
index dfbe335729c1..1dfd0007a0fd 100644
--- a/pkgs/by-name/et/etlegacy-unwrapped/package.nix
+++ b/pkgs/by-name/et/etlegacy-unwrapped/package.nix
@@ -21,26 +21,36 @@
   zlib,
 }:
 let
-  version = "2.83.2";
+  version = "2.84.0";
   fakeGit = writeScriptBin "git" ''
     if [ "$1" = "describe" ]; then
       echo "${version}"
     fi
   '';
+  binarySuffix =
+    if stdenv.hostPlatform.isx86_64 then
+      "x86_64"
+    else if stdenv.hostPlatform.isAarch64 then
+      "aarch64"
+    else if stdenv.hostPlatform.isi686 then
+      "386"
+    else
+      throw "Unsupported architecture: ${stdenv.hostPlatform.system}";
 in
 stdenv.mkDerivation {
   pname = "etlegacy-unwrapped";
   inherit version;
 
+  __structuredAttrs = true;
+  strictDeps = true;
+
   src = fetchFromGitHub {
     owner = "etlegacy";
     repo = "etlegacy";
     tag = "v${version}";
-    hash = "sha256-hZwLYaYV0j3YwFi8KRr4DZV73L2yIwFJ3XqCyq6L7hE=";
+    hash = "sha256-E1eR0OIfXn2QkSGYNu1JFXDIVrkz+pxM7IU0GVkvAFQ=";
   };
 
-  strictDeps = true;
-
   nativeBuildInputs = [
     cmake
     fakeGit
@@ -69,6 +79,9 @@ stdenv.mkDerivation {
     (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release")
     (lib.cmakeBool "BUILD_SERVER" true)
     (lib.cmakeBool "BUILD_CLIENT" true)
+    (lib.cmakeBool "BUNDLED_WOLFSSL" false)
+    (lib.cmakeBool "BUNDLED_OPENSSL" false)
+    (lib.cmakeBool "BUNDLED_CURL" false)
     (lib.cmakeBool "BUNDLED_ZLIB" false)
     (lib.cmakeBool "BUNDLED_CJSON" false)
     (lib.cmakeBool "BUNDLED_JPEG" false)
@@ -86,8 +99,11 @@ stdenv.mkDerivation {
     (lib.cmakeBool "INSTALL_OMNIBOT" false)
     (lib.cmakeBool "INSTALL_GEOIP" false)
     (lib.cmakeBool "INSTALL_WOLFADMIN" false)
+    (lib.cmakeBool "FEATURE_FREETYPE" true)
+    (lib.cmakeBool "FEATURE_GETTEXT" true)
     (lib.cmakeBool "FEATURE_AUTOUPDATE" false)
     (lib.cmakeBool "FEATURE_RENDERER2" false)
+    (lib.cmakeBool "RENDERER_DYNAMIC" true)
     (lib.cmakeFeature "INSTALL_DEFAULT_BASEDIR" "${placeholder "out"}/lib/etlegacy")
     (lib.cmakeFeature "INSTALL_DEFAULT_BINDIR" "${placeholder "out"}/bin")
   ];
@@ -104,5 +120,7 @@ stdenv.mkDerivation {
     maintainers = with lib.maintainers; [
       ashleyghooper
     ];
+    mainProgram = "etl." + binarySuffix;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/et/etlegacy/package.nix b/pkgs/by-name/et/etlegacy/package.nix
index 250775ae043e..b420c87e66a7 100644
--- a/pkgs/by-name/et/etlegacy/package.nix
+++ b/pkgs/by-name/et/etlegacy/package.nix
@@ -7,9 +7,20 @@
   makeBinaryWrapper,
 }:
 
+let
+  binarySuffix =
+    if stdenv.hostPlatform.isx86_64 then
+      "x86_64"
+    else if stdenv.hostPlatform.isAarch64 then
+      "aarch64"
+    else if stdenv.hostPlatform.isi686 then
+      "386"
+    else
+      throw "Unsupported architecture: ${stdenv.hostPlatform.system}";
+in
 symlinkJoin {
   pname = "etlegacy";
-  version = "2.83.2";
+  version = "2.84.0";
 
   paths = [
     etlegacy-assets
@@ -39,7 +50,7 @@ symlinkJoin {
       for the popular online FPS game Wolfenstein: Enemy Territory - whose
       gameplay is still considered unmatched by many, despite its great age.
     '';
-    mainProgram = "etl." + (if stdenv.hostPlatform.isi686 then "i386" else "x86_64");
+    mainProgram = "etl." + binarySuffix;
     maintainers = with lib.maintainers; [
       ashleyghooper
     ];