From 1b86376d8886fcfb9815abfb2ffd1a0a9689307e Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Thu, 22 Jan 2026 07:58:24 +0100
Subject: [PATCH] openttd{,-jgrpp,-grfcodec,nml}: move to pkgs/by-name

this shouldn't create any rebuilds
---
 .../op/openttd-grfcodec/package.nix}                |  0
 .../op/openttd-jgrpp/package.nix}                   |  1 -
 .../nml.nix => by-name/op/openttd-nml/package.nix}  |  0
 .../default.nix => by-name/op/openttd/package.nix}  |  3 ++-
 pkgs/top-level/all-packages.nix                     | 13 -------------
 5 files changed, 2 insertions(+), 15 deletions(-)
 rename pkgs/{games/openttd/grfcodec.nix => by-name/op/openttd-grfcodec/package.nix} (100%)
 rename pkgs/{games/openttd/jgrpp.nix => by-name/op/openttd-jgrpp/package.nix} (99%)
 rename pkgs/{games/openttd/nml.nix => by-name/op/openttd-nml/package.nix} (100%)
 rename pkgs/{games/openttd/default.nix => by-name/op/openttd/package.nix} (98%)

diff --git a/pkgs/games/openttd/grfcodec.nix b/pkgs/by-name/op/openttd-grfcodec/package.nix
similarity index 100%
rename from pkgs/games/openttd/grfcodec.nix
rename to pkgs/by-name/op/openttd-grfcodec/package.nix
diff --git a/pkgs/games/openttd/jgrpp.nix b/pkgs/by-name/op/openttd-jgrpp/package.nix
similarity index 99%
rename from pkgs/games/openttd/jgrpp.nix
rename to pkgs/by-name/op/openttd-jgrpp/package.nix
index e875fcf8956b..edb4f837ce72 100644
--- a/pkgs/games/openttd/jgrpp.nix
+++ b/pkgs/by-name/op/openttd-jgrpp/package.nix
@@ -2,7 +2,6 @@
   fetchFromGitHub,
   openttd,
   zstd,
-  ...
 }:
 
 openttd.overrideAttrs (oldAttrs: rec {
diff --git a/pkgs/games/openttd/nml.nix b/pkgs/by-name/op/openttd-nml/package.nix
similarity index 100%
rename from pkgs/games/openttd/nml.nix
rename to pkgs/by-name/op/openttd-nml/package.nix
diff --git a/pkgs/games/openttd/default.nix b/pkgs/by-name/op/openttd/package.nix
similarity index 98%
rename from pkgs/games/openttd/default.nix
rename to pkgs/by-name/op/openttd/package.nix
index 90a4948960e6..14a83510f6b0 100644
--- a/pkgs/games/openttd/default.nix
+++ b/pkgs/by-name/op/openttd/package.nix
@@ -8,6 +8,7 @@
   SDL2,
   libpng,
   zlib,
+  zlib' ? zlib.override { static = true; },
   xz,
   freetype,
   fontconfig,
@@ -87,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
     SDL2
     libpng
     xz
-    zlib
+    zlib'
     freetype
     fontconfig
     curl
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c1511cad7e5a..93df76c8b22c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12345,19 +12345,6 @@ with pkgs;
 
   openra = openraPackages.engines.release;
 
-  openttd = callPackage ../games/openttd {
-    zlib = zlib.override {
-      static = true;
-    };
-  };
-  openttd-jgrpp = callPackage ../games/openttd/jgrpp.nix {
-    zlib = zlib.override {
-      static = true;
-    };
-  };
-  openttd-grfcodec = callPackage ../games/openttd/grfcodec.nix { };
-  openttd-nml = callPackage ../games/openttd/nml.nix { };
-
   openxray = callPackage ../games/openxray {
     # Builds with Clang, but hits an assertion failure unless GCC is used
     # https://github.com/OpenXRay/xray-16/issues/1224