Merge pull request #94908 from siraben/powder-v95

the-powder-toy: 94.1 -> 95.0
This commit is contained in:
Silvan Mosberger 2020-08-08 14:43:02 +02:00 committed by GitHub
commit dab35c3025
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,21 +1,24 @@
{ stdenv, fetchFromGitHub, scons, pkgconfig, SDL2, lua, fftwFloat, zlib, bzip2 }:
{ stdenv, fetchFromGitHub, scons, pkgconfig, SDL2, lua, fftwFloat,
zlib, bzip2, curl, darwin }:
stdenv.mkDerivation rec {
pname = "the-powder-toy";
version = "94.1";
version = "95.0";
src = fetchFromGitHub {
owner = "ThePowderToy";
owner = "The-Powder-Toy";
repo = "The-Powder-Toy";
rev = "v${version}";
sha256 = "0w3i4zjkw52qbv3s9cgcwxrdbb1npy0ka7wygyb76xcb17bj0l0b";
sha256 = "18rp2g1mj0gklra06wm9dm57h73hmm301npndh0y8ap192i5s8sa";
};
nativeBuildInputs = [ scons pkgconfig ];
buildInputs = [ SDL2 lua fftwFloat zlib bzip2 ];
propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin
[ darwin.apple_sdk.frameworks.Cocoa ];
sconsFlags = "--tool=";
buildInputs = [ SDL2 lua fftwFloat zlib bzip2 curl ];
installPhase = ''
install -Dm 755 build/powder* "$out/bin/powder"
@ -28,6 +31,6 @@ stdenv.mkDerivation rec {
homepage = "http://powdertoy.co.uk/";
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
license = licenses.gpl3;
maintainers = with maintainers; [ abbradar ];
maintainers = with maintainers; [ abbradar siraben ];
};
}