black-hole-solver: migrate to by-name, fix cross (#397056)

authored by

Colin and committed by
GitHub
b1ba006f f378b788

+5 -11
+5 -7
pkgs/games/black-hole-solver/default.nix pkgs/by-name/bl/black-hole-solver/package.nix
··· 3 lib, 4 fetchurl, 5 cmake, 6 - perl, 7 pkg-config, 8 python3, 9 rinutils, 10 - PathTiny, 11 }: 12 13 stdenv.mkDerivation rec { ··· 21 22 nativeBuildInputs = [ 23 cmake 24 - perl 25 pkg-config 26 python3 27 ]; 28 - 29 buildInputs = [ 30 rinutils 31 - PathTiny 32 ]; 33 34 prePatch = '' 35 patchShebangs ./scripts 36 ''; 37 38 - meta = with lib; { 39 description = "Solver for Solitaire variants Golf, Black Hole, and All in a Row"; 40 mainProgram = "black-hole-solve"; 41 homepage = "https://www.shlomifish.org/open-source/projects/black-hole-solitaire-solver/"; 42 - license = licenses.mit; 43 }; 44 }
··· 3 lib, 4 fetchurl, 5 cmake, 6 + buildPackages, 7 pkg-config, 8 python3, 9 rinutils, 10 }: 11 12 stdenv.mkDerivation rec { ··· 20 21 nativeBuildInputs = [ 22 cmake 23 + (buildPackages.perl.withPackages (ps: [ ps.PathTiny ])) 24 pkg-config 25 python3 26 ]; 27 buildInputs = [ 28 rinutils 29 ]; 30 31 prePatch = '' 32 patchShebangs ./scripts 33 ''; 34 35 + meta = { 36 description = "Solver for Solitaire variants Golf, Black Hole, and All in a Row"; 37 mainProgram = "black-hole-solve"; 38 homepage = "https://www.shlomifish.org/open-source/projects/black-hole-solitaire-solver/"; 39 + license = lib.licenses.mit; 40 + maintainers = [ ]; 41 }; 42 }
-4
pkgs/top-level/all-packages.nix
··· 17141 17142 beancount-share = callPackage ../applications/office/beancount/beancount_share.nix { }; 17143 17144 - black-hole-solver = callPackage ../games/black-hole-solver { 17145 - inherit (perlPackages) PathTiny; 17146 - }; 17147 - 17148 bugdom = callPackage ../games/bugdom { 17149 stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; 17150 inherit (darwin.apple_sdk_11_0.frameworks) IOKit Foundation OpenGL;
··· 17141 17142 beancount-share = callPackage ../applications/office/beancount/beancount_share.nix { }; 17143 17144 bugdom = callPackage ../games/bugdom { 17145 stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; 17146 inherit (darwin.apple_sdk_11_0.frameworks) IOKit Foundation OpenGL;