From 64131c2a6f40fdc1d2f751a3803dfbf94c35223e Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 15 Mar 2025 09:55:10 +0100
Subject: [PATCH] hedgewars: move to by-name tree

---
 .../default.nix => by-name/he/hedgewars/package.nix}        | 6 +++---
 pkgs/{games => by-name/he}/hedgewars/support-ffmpeg-6.patch | 0
 pkgs/top-level/all-packages.nix                             | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)
 rename pkgs/{games/hedgewars/default.nix => by-name/he/hedgewars/package.nix} (98%)
 rename pkgs/{games => by-name/he}/hedgewars/support-ffmpeg-6.patch (100%)

diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/by-name/he/hedgewars/package.nix
similarity index 98%
rename from pkgs/games/hedgewars/default.nix
rename to pkgs/by-name/he/hedgewars/package.nix
index f98183d8239d..29ac61b55e8f 100644
--- a/pkgs/games/hedgewars/default.nix
+++ b/pkgs/by-name/he/hedgewars/package.nix
@@ -19,14 +19,14 @@
   libGL,
   libGLU,
   physfs,
-  qtbase,
-  qttools,
-  wrapQtAppsHook,
+  qt5,
   llvm,
   withServer ? true,
 }:
 
 let
+  inherit (qt5) qtbase qttools wrapQtAppsHook;
+
   ghc = haskell.packages.ghc94.ghcWithPackages (
     pkgs: with pkgs; [
       SHA
diff --git a/pkgs/games/hedgewars/support-ffmpeg-6.patch b/pkgs/by-name/he/hedgewars/support-ffmpeg-6.patch
similarity index 100%
rename from pkgs/games/hedgewars/support-ffmpeg-6.patch
rename to pkgs/by-name/he/hedgewars/support-ffmpeg-6.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8027a21d6b80..b9763c269abf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16173,8 +16173,6 @@ with pkgs;
 
   qtads = qt5.callPackage ../games/qtads { };
 
-  hedgewars = libsForQt5.callPackage ../games/hedgewars { };
-
   ibmcloud-cli = callPackage ../tools/admin/ibmcloud-cli { stdenv = stdenvNoCC; };
 
   instaloader = python3Packages.callPackage ../tools/misc/instaloader { };