From 018e0aec1a7fb8df2811c2aacd1f69057ac3cd13 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Wed, 22 Oct 2025 14:57:42 -0700
Subject: [PATCH] scummvm: modernize, move to by-name/

---
 pkgs/{games => by-name/sc}/scummvm/games.nix       |  0
 .../default.nix => by-name/sc/scummvm/package.nix} | 14 +++++++-------
 pkgs/top-level/all-packages.nix                    |  4 +---
 3 files changed, 8 insertions(+), 10 deletions(-)
 rename pkgs/{games => by-name/sc}/scummvm/games.nix (100%)
 rename pkgs/{games/scummvm/default.nix => by-name/sc/scummvm/package.nix} (88%)

diff --git a/pkgs/games/scummvm/games.nix b/pkgs/by-name/sc/scummvm/games.nix
similarity index 100%
rename from pkgs/games/scummvm/games.nix
rename to pkgs/by-name/sc/scummvm/games.nix
diff --git a/pkgs/games/scummvm/default.nix b/pkgs/by-name/sc/scummvm/package.nix
similarity index 88%
rename from pkgs/games/scummvm/default.nix
rename to pkgs/by-name/sc/scummvm/package.nix
index 54e4c74bd414..15831abecef0 100644
--- a/pkgs/games/scummvm/default.nix
+++ b/pkgs/by-name/sc/scummvm/package.nix
@@ -23,14 +23,14 @@
   nix-update-script,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "scummvm";
   version = "2.9.1";
 
   src = fetchFromGitHub {
     owner = "scummvm";
     repo = "scummvm";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-+MM47piuXuIBmAQd0g/cAg5t02qSQ0sw/DwFrMUSIAA=";
   };
 
@@ -82,12 +82,12 @@ stdenv.mkDerivation rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Program to run certain classic graphical point-and-click adventure games (such as Monkey Island)";
     mainProgram = "scummvm";
     homepage = "https://www.scummvm.org/";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.peterhoeg ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ peterhoeg ];
+    platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac4c21b29bea..044183deddec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13343,9 +13343,7 @@ with pkgs;
     buildShareware = true;
   };
 
-  scummvm = callPackage ../games/scummvm { };
-
-  inherit (callPackage ../games/scummvm/games.nix { })
+  inherit (callPackage ../by-name/sc/scummvm/games.nix { })
     beneath-a-steel-sky
     broken-sword-25
     drascula-the-vampire-strikes-back