about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorhqurve <hqurve@outlook.com>2022-04-01 07:13:52 -0400
committerhqurve <hqurve@outlook.com>2022-04-01 07:13:52 -0400
commit00bbc3f18e95e69b579594a3f022cc0bce42d11e (patch)
treeadad16947ccbec9e9a30e6caa0e1a53dacd59f08 /pkgs
parentd066c1229893851c997d2b79b5747d09ff4c0b8e (diff)
downloadnixlib-00bbc3f18e95e69b579594a3f022cc0bce42d11e.tar
nixlib-00bbc3f18e95e69b579594a3f022cc0bce42d11e.tar.gz
nixlib-00bbc3f18e95e69b579594a3f022cc0bce42d11e.tar.bz2
nixlib-00bbc3f18e95e69b579594a3f022cc0bce42d11e.tar.lz
nixlib-00bbc3f18e95e69b579594a3f022cc0bce42d11e.tar.xz
nixlib-00bbc3f18e95e69b579594a3f022cc0bce42d11e.tar.zst
nixlib-00bbc3f18e95e69b579594a3f022cc0bce42d11e.zip
Revert "space-cadet-pinball: fix darwin build"
This reverts commit d066c1229893851c997d2b79b5747d09ff4c0b8e.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/games/space-cadet-pinball/default.nix13
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 4 insertions, 13 deletions
diff --git a/pkgs/games/space-cadet-pinball/default.nix b/pkgs/games/space-cadet-pinball/default.nix
index 31df5377f1d3..312b2e32823b 100644
--- a/pkgs/games/space-cadet-pinball/default.nix
+++ b/pkgs/games/space-cadet-pinball/default.nix
@@ -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";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7f0d13a25e9c..7fa2d5eb471a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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;