From 83f30e8ab718a8ba6fa3728838e31baac845a79d Mon Sep 17 00:00:00 2001
From: Keenan Weaver <keenanweaver@protonmail.com>
Date: Mon, 3 Feb 2025 16:11:55 -0600
Subject: [PATCH 1/2] doomrunner: move to by-name

---
 .../default.nix => by-name/do/doomrunner/package.nix}           | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{games/doom-ports/doomrunner/default.nix => by-name/do/doomrunner/package.nix} (100%)

diff --git a/pkgs/games/doom-ports/doomrunner/default.nix b/pkgs/by-name/do/doomrunner/package.nix
similarity index 100%
rename from pkgs/games/doom-ports/doomrunner/default.nix
rename to pkgs/by-name/do/doomrunner/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b27d548a1a4..4afc00c1e261 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16091,8 +16091,6 @@ with pkgs;
 
   doomseeker = qt5.callPackage ../games/doom-ports/doomseeker { };
 
-  doomrunner = qt5.callPackage ../games/doom-ports/doomrunner { };
-
   enyo-launcher = libsForQt5.callPackage ../games/doom-ports/enyo-launcher { };
 
   slade = callPackage ../games/doom-ports/slade {

From 9779a3e4ad55bc21f9273737535433c37c92b48f Mon Sep 17 00:00:00 2001
From: Keenan Weaver <keenanweaver@protonmail.com>
Date: Mon, 3 Feb 2025 17:48:13 -0600
Subject: [PATCH 2/2] doomrunner: 1.8.3 -> 1.9.0, cleanup

---
 pkgs/by-name/do/doomrunner/package.nix | 53 +++++++++-----------------
 1 file changed, 17 insertions(+), 36 deletions(-)

diff --git a/pkgs/by-name/do/doomrunner/package.nix b/pkgs/by-name/do/doomrunner/package.nix
index c61055e190ab..2bb8b59e6a1a 100644
--- a/pkgs/by-name/do/doomrunner/package.nix
+++ b/pkgs/by-name/do/doomrunner/package.nix
@@ -1,30 +1,26 @@
 {
   lib,
   stdenv,
-  qtbase,
-  qmake,
-  makeDesktopItem,
-  wrapQtAppsHook,
-  imagemagick,
+  kdePackages,
   fetchFromGitHub,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "doomrunner";
-  version = "1.8.3";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "Youda008";
     repo = "DoomRunner";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-NpNhl3cGXpxI8Qu4l8PjojCCXCZdGBEkBzz5XxLm/mY=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-rCoMTPGjIFAcNncBGg1IMdUahzjH0WlFZBZS0UmNI/g=";
   };
 
-  buildInputs = [ qtbase ];
+  buildInputs = [ kdePackages.qtbase ];
+
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
-    imagemagick
+    kdePackages.qmake
+    kdePackages.wrapQtAppsHook
   ];
 
   makeFlags = [
@@ -32,35 +28,20 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   postInstall = ''
-    mkdir -p $out/{bin,share/applications}
+    mkdir -p $out/{bin,share/applications,share/icons/hicolor/128x128/apps}
+    install -Dm444 $src/Install/XDG/DoomRunner.128x128.png $out/share/icons/hicolor/128x128/apps/DoomRunner.png
+    install -Dm444 $src/Install/XDG/DoomRunner.desktop $out/share/applications/DoomRunner.desktop
     install -Dm755 $out/usr/bin/DoomRunner $out/bin/DoomRunner
-
-    for size in 16 24 32 48 64 128; do
-      mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
-      convert -background none -resize "$size"x"$size" $PWD/Resources/DoomRunner.ico -flatten $out/share/icons/hicolor/"$size"x"$size"/apps/DoomRunner.png
-    done;
-
-    install -m 444 -D "$desktopItem/share/applications/"* -t $out/share/applications/
     rm -rf $out/usr
   '';
 
-  desktopItem = makeDesktopItem {
-    name = "DoomRunner";
-    desktopName = "DoomRunner";
-    comment = "Preset-oriented graphical launcher of ZDoom and derivatives";
-    categories = [ "Game" ];
-    icon = "DoomRunner";
-    type = "Application";
-    exec = "DoomRunner";
-  };
-
-  meta = with lib; {
-    description = "Graphical launcher of ZDoom and derivatives";
+  meta = {
+    description = "Preset-oriented graphical launcher of various ported Doom engines";
     mainProgram = "DoomRunner";
-    homepage = "https://github.com/Youda008/DoomRunner/";
+    homepage = "https://github.com/Youda008/DoomRunner";
     changelog = "https://github.com/Youda008/DoomRunner/blob/${finalAttrs.src.rev}/changelog.txt";
-    license = licenses.gpl3Only;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ keenanweaver ];
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ keenanweaver ];
   };
 })