From de13f429d73f2ad17b8628cec1b3f9aacc3c4ccf Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Sun, 20 Apr 2025 09:51:45 +1200
Subject: [PATCH] heroic: migrate to pkgs/by-name

---
 .../he/heroic-unwrapped}/fix-non-steam-shortcuts.patch     | 0
 .../he/heroic-unwrapped/package.nix}                       | 6 +++++-
 .../heroic/fhsenv.nix => by-name/he/heroic/package.nix}    | 0
 pkgs/top-level/all-packages.nix                            | 7 -------
 4 files changed, 5 insertions(+), 8 deletions(-)
 rename pkgs/{games/heroic => by-name/he/heroic-unwrapped}/fix-non-steam-shortcuts.patch (100%)
 rename pkgs/{games/heroic/default.nix => by-name/he/heroic-unwrapped/package.nix} (97%)
 rename pkgs/{games/heroic/fhsenv.nix => by-name/he/heroic/package.nix} (100%)

diff --git a/pkgs/games/heroic/fix-non-steam-shortcuts.patch b/pkgs/by-name/he/heroic-unwrapped/fix-non-steam-shortcuts.patch
similarity index 100%
rename from pkgs/games/heroic/fix-non-steam-shortcuts.patch
rename to pkgs/by-name/he/heroic-unwrapped/fix-non-steam-shortcuts.patch
diff --git a/pkgs/games/heroic/default.nix b/pkgs/by-name/he/heroic-unwrapped/package.nix
similarity index 97%
rename from pkgs/games/heroic/default.nix
rename to pkgs/by-name/he/heroic-unwrapped/package.nix
index d04a3418037f..f6ac7868637f 100644
--- a/pkgs/games/heroic/default.nix
+++ b/pkgs/by-name/he/heroic-unwrapped/package.nix
@@ -7,7 +7,8 @@
   nodejs,
   python3,
   makeWrapper,
-  electron,
+  # Upstream uses EOL Electron 31.  Use next oldest version.
+  electron_33,
   vulkan-helper,
   gogdl,
   legendary-heroic,
@@ -15,6 +16,9 @@
   comet-gog,
 }:
 
+let
+  electron = electron_33;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "heroic-unwrapped";
   version = "2.16.1";
diff --git a/pkgs/games/heroic/fhsenv.nix b/pkgs/by-name/he/heroic/package.nix
similarity index 100%
rename from pkgs/games/heroic/fhsenv.nix
rename to pkgs/by-name/he/heroic/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6da35dd1f4a3..045ae0e16037 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17030,13 +17030,6 @@ with pkgs;
     fteqcc
     ;
 
-  heroic-unwrapped = callPackage ../games/heroic {
-    # Upstream uses EOL Electron 31.  Use next oldest version.
-    electron = electron_33;
-  };
-
-  heroic = callPackage ../games/heroic/fhsenv.nix { };
-
   pmars-x11 = pmars.override { enableXwinGraphics = true; };
 
   vanillatd = callPackage ../by-name/va/vanillatd/package.nix { appName = "vanillatd"; };