Skip to content

Commit b1ba006

Browse files
authored
black-hole-solver: migrate to by-name, fix cross (NixOS#397056)
2 parents f378b78 + e12c51a commit b1ba006

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

pkgs/games/black-hole-solver/default.nix renamed to pkgs/by-name/bl/black-hole-solver/package.nix

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
lib,
44
fetchurl,
55
cmake,
6-
perl,
6+
buildPackages,
77
pkg-config,
88
python3,
99
rinutils,
10-
PathTiny,
1110
}:
1211

1312
stdenv.mkDerivation rec {
@@ -21,24 +20,23 @@ stdenv.mkDerivation rec {
2120

2221
nativeBuildInputs = [
2322
cmake
24-
perl
23+
(buildPackages.perl.withPackages (ps: [ ps.PathTiny ]))
2524
pkg-config
2625
python3
2726
];
28-
2927
buildInputs = [
3028
rinutils
31-
PathTiny
3229
];
3330

3431
prePatch = ''
3532
patchShebangs ./scripts
3633
'';
3734

38-
meta = with lib; {
35+
meta = {
3936
description = "Solver for Solitaire variants Golf, Black Hole, and All in a Row";
4037
mainProgram = "black-hole-solve";
4138
homepage = "https://www.shlomifish.org/open-source/projects/black-hole-solitaire-solver/";
42-
license = licenses.mit;
39+
license = lib.licenses.mit;
40+
maintainers = [ ];
4341
};
4442
}

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17141,10 +17141,6 @@ with pkgs;
1714117141

1714217142
beancount-share = callPackage ../applications/office/beancount/beancount_share.nix { };
1714317143

17144-
black-hole-solver = callPackage ../games/black-hole-solver {
17145-
inherit (perlPackages) PathTiny;
17146-
};
17147-
1714817144
bugdom = callPackage ../games/bugdom {
1714917145
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
1715017146
inherit (darwin.apple_sdk_11_0.frameworks) IOKit Foundation OpenGL;

0 commit comments

Comments
 (0)