From e12c51a047bcacf0e0ee845e5ba451f189162d0a Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Tue, 8 Apr 2025 09:28:01 +0200
Subject: [PATCH] black-hole-solver: migrate to by-name, fix cross

---
 .../bl/black-hole-solver/package.nix}                | 12 +++++-------
 pkgs/top-level/all-packages.nix                      |  4 ----
 2 files changed, 5 insertions(+), 11 deletions(-)
 rename pkgs/{games/black-hole-solver/default.nix => by-name/bl/black-hole-solver/package.nix} (83%)

diff --git a/pkgs/games/black-hole-solver/default.nix b/pkgs/by-name/bl/black-hole-solver/package.nix
similarity index 83%
rename from pkgs/games/black-hole-solver/default.nix
rename to pkgs/by-name/bl/black-hole-solver/package.nix
index 3e0ff95336e4..02e0ee253496 100644
--- a/pkgs/games/black-hole-solver/default.nix
+++ b/pkgs/by-name/bl/black-hole-solver/package.nix
@@ -3,11 +3,10 @@
   lib,
   fetchurl,
   cmake,
-  perl,
+  buildPackages,
   pkg-config,
   python3,
   rinutils,
-  PathTiny,
 }:
 
 stdenv.mkDerivation rec {
@@ -21,24 +20,23 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    perl
+    (buildPackages.perl.withPackages (ps: [ ps.PathTiny ]))
     pkg-config
     python3
   ];
-
   buildInputs = [
     rinutils
-    PathTiny
   ];
 
   prePatch = ''
     patchShebangs ./scripts
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Solver for Solitaire variants Golf, Black Hole, and All in a Row";
     mainProgram = "black-hole-solve";
     homepage = "https://www.shlomifish.org/open-source/projects/black-hole-solitaire-solver/";
-    license = licenses.mit;
+    license = lib.licenses.mit;
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bf74c35eb2bf..928e219c6c87 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17237,10 +17237,6 @@ with pkgs;
 
   beancount-share = callPackage ../applications/office/beancount/beancount_share.nix { };
 
-  black-hole-solver = callPackage ../games/black-hole-solver {
-    inherit (perlPackages) PathTiny;
-  };
-
   bugdom = callPackage ../games/bugdom {
     stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
     inherit (darwin.apple_sdk_11_0.frameworks) IOKit Foundation OpenGL;