Merge pull request #189098 from prusnak/powder

authored by Ben Siraphob and committed by GitHub dc58c958 5230cd90

+21 -8
+20 -8
pkgs/games/the-powder-toy/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, meson, luajit, ninja, pkg-config 2 - , python3, SDL2, lua, fftwFloat, zlib, bzip2, curl, darwin }: 3 4 stdenv.mkDerivation rec { 5 pname = "the-powder-toy"; 6 - version = "96.2.350"; 7 8 src = fetchFromGitHub { 9 owner = "The-Powder-Toy"; 10 repo = "The-Powder-Toy"; 11 - rev = "v${version}"; 12 - sha256 = "sha256-OAy/Hd2UksNiIfTdpA+u9NzIq1pfe8RYG3slI4/LNnM="; 13 }; 14 15 nativeBuildInputs = [ meson ninja pkg-config python3 ]; 16 17 - buildInputs = [ luajit SDL2 lua fftwFloat zlib bzip2 curl ]; 18 19 installPhase = '' 20 install -Dm 755 powder $out/bin/powder ··· 23 mv ../resources/powder.desktop $out/share/applications 24 mv ../resources $out/share 25 ''; 26 - 27 - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; 28 29 meta = with lib; { 30 description = "A free 2D physics sandbox game";
··· 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , meson 5 + , ninja 6 + , pkg-config 7 + , python3 8 + , SDL2 9 + , bzip2 10 + , curl 11 + , fftwFloat 12 + , lua 13 + , luajit 14 + , zlib 15 + , Cocoa }: 16 17 stdenv.mkDerivation rec { 18 pname = "the-powder-toy"; 19 + version = "unstable-2022-08-30"; 20 21 src = fetchFromGitHub { 22 owner = "The-Powder-Toy"; 23 repo = "The-Powder-Toy"; 24 + rev = "9e712eba080e194fc162b475f58aaed8f4ea008e"; 25 + sha256 = "sha256-44xUfif1E+T9jzixWgnBxOWmzPPuVZy7rf62ig/CczA="; 26 }; 27 28 nativeBuildInputs = [ meson ninja pkg-config python3 ]; 29 30 + buildInputs = [ SDL2 bzip2 curl fftwFloat lua luajit zlib ] 31 + ++ lib.optionals stdenv.isDarwin [ Cocoa ]; 32 33 installPhase = '' 34 install -Dm 755 powder $out/bin/powder ··· 37 mv ../resources/powder.desktop $out/share/applications 38 mv ../resources $out/share 39 ''; 40 41 meta = with lib; { 42 description = "A free 2D physics sandbox game";
+1
pkgs/top-level/all-packages.nix
··· 33533 33534 the-powder-toy = callPackage ../games/the-powder-toy { 33535 lua = lua5_1; 33536 }; 33537 33538 tbe = libsForQt5.callPackage ../games/the-butterfly-effect { };
··· 33533 33534 the-powder-toy = callPackage ../games/the-powder-toy { 33535 lua = lua5_1; 33536 + inherit (darwin.apple_sdk.frameworks) Cocoa; 33537 }; 33538 33539 tbe = libsForQt5.callPackage ../games/the-butterfly-effect { };