From d066c1229893851c997d2b79b5747d09ff4c0b8e Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 30 Mar 2022 19:46:19 -0500 Subject: [PATCH] space-cadet-pinball: fix darwin build --- pkgs/games/space-cadet-pinball/default.nix | 13 ++++++++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/games/space-cadet-pinball/default.nix b/pkgs/games/space-cadet-pinball/default.nix index 312b2e32823b..31df5377f1d3 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 +, cmake, SDL2, SDL2_mixer, Cocoa , unrar-wrapper, makeWrapper , fetchpatch }: @@ -38,15 +38,21 @@ stdenv.mkDerivation rec { SDL2_mixer cmake makeWrapper + Cocoa ]; - postInstall = '' + preBuild = '' 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 - mv $out/bin/SpaceCadetPinball $out/lib/SpaceCadetPinball + cp ../bin/SpaceCadetPinball $out/bin + cp $out/bin/SpaceCadetPinball $out/lib/SpaceCadetPinball makeWrapper $out/lib/SpaceCadetPinball/SpaceCadetPinball $out/bin/SpaceCadetPinball ''; @@ -57,5 +63,6 @@ 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 7fa2d5eb471a..7f0d13a25e9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31682,7 +31682,9 @@ with pkgs; rrootage = callPackage ../games/rrootage { }; - space-cadet-pinball = callPackage ../games/space-cadet-pinball { }; + space-cadet-pinball = callPackage ../games/space-cadet-pinball { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; starsector = callPackage ../games/starsector { openjdk = openjdk8;