black-hole-solver: migrate to by-name, fix cross

This commit is contained in:
FliegendeWurst 2025-04-08 09:28:01 +02:00
parent 20b2600fa7
commit e12c51a047
2 changed files with 5 additions and 11 deletions

View file

@ -3,11 +3,10 @@
lib, lib,
fetchurl, fetchurl,
cmake, cmake,
perl, buildPackages,
pkg-config, pkg-config,
python3, python3,
rinutils, rinutils,
PathTiny,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -21,24 +20,23 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
perl (buildPackages.perl.withPackages (ps: [ ps.PathTiny ]))
pkg-config pkg-config
python3 python3
]; ];
buildInputs = [ buildInputs = [
rinutils rinutils
PathTiny
]; ];
prePatch = '' prePatch = ''
patchShebangs ./scripts patchShebangs ./scripts
''; '';
meta = with lib; { meta = {
description = "Solver for Solitaire variants Golf, Black Hole, and All in a Row"; description = "Solver for Solitaire variants Golf, Black Hole, and All in a Row";
mainProgram = "black-hole-solve"; mainProgram = "black-hole-solve";
homepage = "https://www.shlomifish.org/open-source/projects/black-hole-solitaire-solver/"; homepage = "https://www.shlomifish.org/open-source/projects/black-hole-solitaire-solver/";
license = licenses.mit; license = lib.licenses.mit;
maintainers = [ ];
}; };
} }

View file

@ -17237,10 +17237,6 @@ with pkgs;
beancount-share = callPackage ../applications/office/beancount/beancount_share.nix { }; beancount-share = callPackage ../applications/office/beancount/beancount_share.nix { };
black-hole-solver = callPackage ../games/black-hole-solver {
inherit (perlPackages) PathTiny;
};
bugdom = callPackage ../games/bugdom { bugdom = callPackage ../games/bugdom {
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
inherit (darwin.apple_sdk_11_0.frameworks) IOKit Foundation OpenGL; inherit (darwin.apple_sdk_11_0.frameworks) IOKit Foundation OpenGL;