From 871a78c326f5b8aaca8458986aed1b0d8624c32d Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Sat, 2 Aug 2025 12:54:17 +0200
Subject: [PATCH 1/5] crispy-doom: refactor

---
 pkgs/by-name/cr/crispy-doom/package.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/cr/crispy-doom/package.nix b/pkgs/by-name/cr/crispy-doom/package.nix
index 16964496ce15..33e25dd195c7 100644
--- a/pkgs/by-name/cr/crispy-doom/package.nix
+++ b/pkgs/by-name/cr/crispy-doom/package.nix
@@ -1,28 +1,27 @@
 {
   lib,
   stdenv,
+  fetchFromGitHub,
   autoreconfHook,
   pkg-config,
+  python3,
   SDL2,
   SDL2_mixer,
   SDL2_net,
-  fetchFromGitHub,
-  python3,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "crispy-doom";
   version = "7.0";
 
   src = fetchFromGitHub {
     owner = "fabiangreffrath";
     repo = "crispy-doom";
-    rev = "crispy-doom-${version}";
-    sha256 = "sha256-+rNZsb4GAjzNcIU5xZGBpmP+nXNOP16oVg68nfecMrw=";
+    tag = "crispy-doom-${finalAttrs.version}";
+    hash = "sha256-+rNZsb4GAjzNcIU5xZGBpmP+nXNOP16oVg68nfecMrw=";
   };
 
   postPatch = ''
-    sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am
     for script in $(grep -lr '^#!/usr/bin/env python3$'); do patchShebangs $script; done
   '';
 
@@ -31,24 +30,28 @@ stdenv.mkDerivation rec {
     pkg-config
     python3
   ];
+
   buildInputs = [
     SDL2
     SDL2_mixer
     SDL2_net
   ];
+
   enableParallelBuilding = true;
 
   strictDeps = true;
 
   meta = {
-    homepage = "http://fabiangreffrath.github.io/crispy-doom";
+    homepage = "https://fabiangreffrath.github.io/crispy-homepage";
+    changelog = "https://github.com/fabiangreffrath/crispy-doom/releases/tag/crispy-doom-${finalAttrs.version}";
     description = "Limit-removing enhanced-resolution Doom source port based on Chocolate Doom";
     longDescription = ''
       Crispy Doom is a limit-removing enhanced-resolution Doom source port based on Chocolate Doom.
       Its name means that 640x400 looks \"crisp\" and is also a slight reference to its origin.
     '';
+    mainProgram = "crispy-doom";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ neonfuz ];
   };
-}
+})

From a723fc2cca00a6e93a9bf3b9c74ca2ef74468381 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Sat, 2 Aug 2025 12:58:32 +0200
Subject: [PATCH 2/5] crispy-doom: add missing dependencies

---
 pkgs/by-name/cr/crispy-doom/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/cr/crispy-doom/package.nix b/pkgs/by-name/cr/crispy-doom/package.nix
index 33e25dd195c7..6a8802ea9307 100644
--- a/pkgs/by-name/cr/crispy-doom/package.nix
+++ b/pkgs/by-name/cr/crispy-doom/package.nix
@@ -3,11 +3,14 @@
   stdenv,
   fetchFromGitHub,
   autoreconfHook,
+  libpng,
+  libsamplerate,
   pkg-config,
   python3,
   SDL2,
   SDL2_mixer,
   SDL2_net,
+  zlib,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -32,9 +35,12 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
+    libpng
+    libsamplerate
     SDL2
     SDL2_mixer
     SDL2_net
+    zlib
   ];
 
   enableParallelBuilding = true;

From 0361a0e9ce02c212c290b470bffbaa787fa7a5c6 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Sat, 2 Aug 2025 13:14:12 +0200
Subject: [PATCH 3/5] crispy-doom: add optional truecolor support

---
 pkgs/by-name/cr/crispy-doom/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/cr/crispy-doom/package.nix b/pkgs/by-name/cr/crispy-doom/package.nix
index 6a8802ea9307..dade280730bd 100644
--- a/pkgs/by-name/cr/crispy-doom/package.nix
+++ b/pkgs/by-name/cr/crispy-doom/package.nix
@@ -11,6 +11,8 @@
   SDL2_mixer,
   SDL2_net,
   zlib,
+
+  enableTruecolor ? false,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -28,6 +30,8 @@ stdenv.mkDerivation (finalAttrs: {
     for script in $(grep -lr '^#!/usr/bin/env python3$'); do patchShebangs $script; done
   '';
 
+  configureFlags = lib.optional enableTruecolor [ "--enable-truecolor" ];
+
   nativeBuildInputs = [
     autoreconfHook
     pkg-config

From 8cdc932fb9f1511e92276c3f652cc57e75415c45 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Sat, 2 Aug 2025 13:14:32 +0200
Subject: [PATCH 4/5] crispy-doom: add myself as maintainer

---
 pkgs/by-name/cr/crispy-doom/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/cr/crispy-doom/package.nix b/pkgs/by-name/cr/crispy-doom/package.nix
index dade280730bd..a4993ef6c200 100644
--- a/pkgs/by-name/cr/crispy-doom/package.nix
+++ b/pkgs/by-name/cr/crispy-doom/package.nix
@@ -62,6 +62,9 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "crispy-doom";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ neonfuz ];
+    maintainers = with lib.maintainers; [
+      Gliczy
+      neonfuz
+    ];
   };
 })

From b4d2664f99b958674560389618f4b5c195373933 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Sat, 2 Aug 2025 14:15:35 +0200
Subject: [PATCH 5/5] crispy-doom: add keenanweaver as maintainer

---
 pkgs/by-name/cr/crispy-doom/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/cr/crispy-doom/package.nix b/pkgs/by-name/cr/crispy-doom/package.nix
index a4993ef6c200..e2d5632915c5 100644
--- a/pkgs/by-name/cr/crispy-doom/package.nix
+++ b/pkgs/by-name/cr/crispy-doom/package.nix
@@ -64,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
       Gliczy
+      keenanweaver
       neonfuz
     ];
   };