b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Revert "space-cadet-pinball: fix darwin build"

Browse source 
This reverts commit d066c12298.
This commit is contained in:
hqurve 2022-04-01 07:13:52 -04:00
parent d066c12298
commit 00bbc3f18e
2 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/games/space-cadet-pinball/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, fetchzip
, cmake, SDL2, SDL2_mixer, Cocoa
, cmake, SDL2, SDL2_mixer
, unrar-wrapper, makeWrapper
, fetchpatch
}:
@ -38,21 +38,15 @@ stdenv.mkDerivation rec {
SDL2_mixer
cmake
makeWrapper
Cocoa
];
preBuild = ''
postInstall = ''
mkdir -p $out/lib/SpaceCadetPinball
mkdir -p $out/bin
'';
installPhase = ''
install ${assets}/*.{DAT,DOC,MID,BMP,INF} ${assets}/Sounds/*.WAV $out/lib/SpaceCadetPinball
# Assets are loaded from the directory of the program is stored in
# https://github.com/k4zmu2a/SpaceCadetPinball/blob/de13d4e326b2dfa8e6dfb59815c0a8b9657f942d/SpaceCadetPinball/winmain.cpp#L119
cp ../bin/SpaceCadetPinball $out/bin
cp $out/bin/SpaceCadetPinball $out/lib/SpaceCadetPinball
mv $out/bin/SpaceCadetPinball $out/lib/SpaceCadetPinball
makeWrapper $out/lib/SpaceCadetPinball/SpaceCadetPinball $out/bin/SpaceCadetPinball
'';
@ -63,6 +57,5 @@ stdenv.mkDerivation rec {
license = with licenses; [ unfree mit ];
maintainers = [ maintainers.hqurve ];
platforms = platforms.all;
mainProgram = "SpaceCadetPinball";
};
}

4
pkgs/top-level/all-packages.nix
View file

@ -31682,9 +31682,7 @@ with pkgs;
rrootage = callPackage ../games/rrootage { };
space-cadet-pinball = callPackage ../games/space-cadet-pinball {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
space-cadet-pinball = callPackage ../games/space-cadet-pinball { };
starsector = callPackage ../games/starsector {
openjdk = openjdk8;