git.iko.soy/typeable/nixpkgs
on master help sign in
Revert "space-cadet-pinball: fix darwin build"

This reverts commit d066c1229893851c997d2b79b5747d09ff4c0b8e.

commit00bbc3f18e95e69b579594a3f022cc0bce42d11e authorhqurve <hqurve@outlook.com> dateFri 1 Apr 2022, 07:13 (5 years ago) parentd066c12
2 files changed+4−13
pkgs/games/space-cadet-pinball/default.nix+3−10 pkgs/top-level/all-packages.nix+1−3
pkgs/games/space-cadet-pinball/default.nix+3−10
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchFromGitHub, fetchzip
2−, cmake, SDL2, SDL2_mixer, Cocoa
2+, cmake, SDL2, SDL2_mixer
33, unrar-wrapper, makeWrapper
44, fetchpatch
55}:
@@ -38,21 +38,15 @@ stdenv.mkDerivation rec {
3838 SDL2_mixer
3939 cmake
4040 makeWrapper
41− Cocoa
4241 ];
4342
44− preBuild = ''
43+ postInstall = ''
4544 mkdir -p $out/lib/SpaceCadetPinball
46− mkdir -p $out/bin
47− '';
48−
49− installPhase = ''
5045 install ${assets}/*.{DAT,DOC,MID,BMP,INF} ${assets}/Sounds/*.WAV $out/lib/SpaceCadetPinball
5146
5247 # Assets are loaded from the directory of the program is stored in
5348 # https://github.com/k4zmu2a/SpaceCadetPinball/blob/de13d4e326b2dfa8e6dfb59815c0a8b9657f942d/SpaceCadetPinball/winmain.cpp#L119
54− cp ../bin/SpaceCadetPinball $out/bin
55− cp $out/bin/SpaceCadetPinball $out/lib/SpaceCadetPinball
49+ mv $out/bin/SpaceCadetPinball $out/lib/SpaceCadetPinball
5650 makeWrapper $out/lib/SpaceCadetPinball/SpaceCadetPinball $out/bin/SpaceCadetPinball
5751 '';
5852
@@ -63,6 +57,5 @@ stdenv.mkDerivation rec {
6357 license = with licenses; [ unfree mit ];
6458 maintainers = [ maintainers.hqurve ];
6559 platforms = platforms.all;
66− mainProgram = "SpaceCadetPinball";
6760 };
6861}
pkgs/top-level/all-packages.nix+1−3
@@ -31682,9 +31682,7 @@ with pkgs;
3168231682
3168331683 rrootage = callPackage ../games/rrootage { };
3168431684
31685− space-cadet-pinball = callPackage ../games/space-cadet-pinball {
31686− inherit (darwin.apple_sdk.frameworks) Cocoa;
31687− };
31685+ space-cadet-pinball = callPackage ../games/space-cadet-pinball { };
3168831686
3168931687 starsector = callPackage ../games/starsector {
3169031688 openjdk = openjdk8;