Merge pull request #189098 from prusnak/powder

pkgs/games/the-powder-toy/default.nix

@@ -1,20 +1,34 @@
-{ lib, stdenv, fetchFromGitHub, meson, luajit, ninja, pkg-config
+{ lib
-, python3, SDL2, lua, fftwFloat, zlib, bzip2, curl, darwin }:
+, stdenv
+, fetchFromGitHub
+, meson
+, ninja
+, pkg-config
+, python3
+, SDL2
+, bzip2
+, curl
+, fftwFloat
+, lua
+, luajit
+, zlib
+, Cocoa }:
 
 stdenv.mkDerivation rec {
   pname = "the-powder-toy";
-  version = "96.2.350";
+  version = "unstable-2022-08-30";
 
   src = fetchFromGitHub {
     owner = "The-Powder-Toy";
     repo = "The-Powder-Toy";
-    rev = "v${version}";
+    rev = "9e712eba080e194fc162b475f58aaed8f4ea008e";
-    sha256 = "sha256-OAy/Hd2UksNiIfTdpA+u9NzIq1pfe8RYG3slI4/LNnM=";
+    sha256 = "sha256-44xUfif1E+T9jzixWgnBxOWmzPPuVZy7rf62ig/CczA=";
   };
 
   nativeBuildInputs = [ meson ninja pkg-config python3 ];
 
-  buildInputs = [ luajit SDL2 lua fftwFloat zlib bzip2 curl ];
+  buildInputs = [ SDL2 bzip2 curl fftwFloat lua luajit zlib ]
+  ++ lib.optionals stdenv.isDarwin [ Cocoa ];
 
   installPhase = ''
     install -Dm 755 powder $out/bin/powder
@@ -24,8 +38,6 @@ stdenv.mkDerivation rec {
     mv ../resources $out/share
   '';
 
-  propagatedBuildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ];
-
   meta = with lib; {
     description = "A free 2D physics sandbox game";
     homepage = "http://powdertoy.co.uk/";

pkgs/top-level/all-packages.nix

@@ -33533,6 +33533,7 @@ with pkgs;
 
   the-powder-toy = callPackage ../games/the-powder-toy {
     lua = lua5_1;
+    inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
 
   tbe = libsForQt5.callPackage ../games/the-butterfly-effect { };