black-hole-solver: migrate to by-name, fix cross (#397056)
This commit is contained in:
+5
-7
@@ -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 = [ ];
|
||||
};
|
||||
}
|
||||
@@ -17141,10 +17141,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;
|
||||
|
||||
Reference in New Issue
Block a user