From 4b34238a750f49cc6aa8b1d2114416ff3a760221 Mon Sep 17 00:00:00 2001
From: Yiyu Zhou <yiyuzhou19@gmail.com>
Date: Fri, 2 Jan 2026 14:15:36 -0800
Subject: [PATCH 1/2] ezquake: 3.6.3 -> 3.6.8

---
 pkgs/by-name/ez/ezquake/package.nix | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/ez/ezquake/package.nix b/pkgs/by-name/ez/ezquake/package.nix
index 2f30630226b5..c8c6865e755b 100644
--- a/pkgs/by-name/ez/ezquake/package.nix
+++ b/pkgs/by-name/ez/ezquake/package.nix
@@ -7,46 +7,45 @@
   jansson,
   libpng,
   libjpeg,
-  libGLU,
   libGL,
   libX11,
   libsndfile,
-  libXxf86vm,
-  pcre,
+  pcre2,
+  minizip,
+  cmake,
   pkg-config,
   SDL2,
-  vim,
-  speex,
 }:
 
 stdenv.mkDerivation rec {
   pname = "ezquake";
-  version = "3.6.3";
+  version = "3.6.8";
 
   src = fetchFromGitHub {
     owner = "QW-Group";
     repo = "ezquake" + "-source";
     tag = version;
     fetchSubmodules = true;
-    hash = "sha256-ThrsJfj+eP7Lv2ZSNLO6/b98VHrL6/rhwf2p0qMvTF8=";
+    hash = "sha256-BIkBl6ncwo0NljuqOHJ3yQeDTcClh5FGssdFsKUjN90=";
   };
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
   buildInputs = [
+    minizip
+    pcre2
     expat
     curl
     jansson
     libpng
     libjpeg
-    libGLU
     libGL
     libsndfile
     libX11
-    libXxf86vm
-    pcre
     SDL2
-    vim
-    speex
   ];
 
   installPhase =

From 8873e7c1a09222e5b2bae2ea0cd7af9784406251 Mon Sep 17 00:00:00 2001
From: Yiyu Zhou <yiyuzhou19@gmail.com>
Date: Fri, 2 Jan 2026 14:23:29 -0800
Subject: [PATCH 2/2] ezquake: cleanup

---
 pkgs/by-name/ez/ezquake/package.nix | 58 ++++++++++++++++-------------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/pkgs/by-name/ez/ezquake/package.nix b/pkgs/by-name/ez/ezquake/package.nix
index c8c6865e755b..a302fd01c7df 100644
--- a/pkgs/by-name/ez/ezquake/package.nix
+++ b/pkgs/by-name/ez/ezquake/package.nix
@@ -1,30 +1,31 @@
 {
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  curl,
+  SDL2,
+  cmake,
+  curlMinimal,
   expat,
+  fetchFromGitHub,
   jansson,
-  libpng,
-  libjpeg,
+  lib,
   libGL,
   libX11,
+  libjpeg,
+  libpng,
   libsndfile,
-  pcre2,
   minizip,
-  cmake,
+  nix-update-script,
+  pcre2,
   pkg-config,
-  SDL2,
+  stdenv,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ezquake";
   version = "3.6.8";
 
   src = fetchFromGitHub {
     owner = "QW-Group";
-    repo = "ezquake" + "-source";
-    tag = version;
+    repo = "ezquake-source";
+    tag = finalAttrs.version;
     fetchSubmodules = true;
     hash = "sha256-BIkBl6ncwo0NljuqOHJ3yQeDTcClh5FGssdFsKUjN90=";
   };
@@ -35,31 +36,36 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
+    SDL2
+    curlMinimal
+    expat
+    jansson
+    libGL
+    libX11
+    libjpeg
+    libpng
+    libsndfile
     minizip
     pcre2
-    expat
-    curl
-    jansson
-    libpng
-    libjpeg
-    libGL
-    libsndfile
-    libX11
-    SDL2
   ];
 
+  enableParallelBuilding = true;
+
   installPhase =
     let
       sys = lib.last (lib.splitString "-" stdenv.hostPlatform.system);
       arch = lib.head (lib.splitString "-" stdenv.hostPlatform.system);
     in
     ''
-      mkdir -p $out/bin
-      find .
-      mv ezquake-${sys}-${arch} $out/bin/ezquake
+      runHook preInstall
+
+      install -D \
+        ezquake-${sys}-${arch} $out/bin/${finalAttrs.meta.mainProgram}
+
+      runHook postInstall
     '';
 
-  enableParallelBuilding = true;
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     homepage = "https://ezquake.com/";
@@ -69,4 +75,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ edwtjo ];
   };
-}
+})