From 0a2425dcff7b6f8bbd07455a877c49eb19c87b06 Mon Sep 17 00:00:00 2001 From: multiplealiases Date: Wed, 15 Nov 2023 06:57:33 +0800 Subject: the-powder-toy: unstable-2022-08-30 -> 97.0.352 add new deps jsoncpp and libpng, also add mesonFlags -Dworkaround_elusive_bzip2=false to prevent build failure. powder.desktop is now generated inside the build directory from a template in ../resources/powder.template.desktop --- pkgs/games/the-powder-toy/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'pkgs/games/the-powder-toy/default.nix') diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix index 2901f42e095..df8158bf30f 100644 --- a/pkgs/games/the-powder-toy/default.nix +++ b/pkgs/games/the-powder-toy/default.nix @@ -12,29 +12,33 @@ , lua , luajit , zlib +, jsoncpp +, libpng , Cocoa }: stdenv.mkDerivation rec { pname = "the-powder-toy"; - version = "unstable-2022-08-30"; + version = "97.0.352"; src = fetchFromGitHub { owner = "The-Powder-Toy"; repo = "The-Powder-Toy"; - rev = "9e712eba080e194fc162b475f58aaed8f4ea008e"; - sha256 = "sha256-44xUfif1E+T9jzixWgnBxOWmzPPuVZy7rf62ig/CczA="; + rev = "v${version}"; + sha256 = "sha256-LYohsqFU9LBgTXMaV6cf8/zf3fBvT+s5A1JBpPHekH8="; }; nativeBuildInputs = [ meson ninja pkg-config python3 ]; - buildInputs = [ SDL2 bzip2 curl fftwFloat lua luajit zlib ] + buildInputs = [ SDL2 bzip2 curl fftwFloat lua luajit zlib jsoncpp libpng ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + mesonFlags = [ "-Dworkaround_elusive_bzip2=false" ]; + installPhase = '' install -Dm 755 powder $out/bin/powder mkdir -p $out/share/applications - mv ../resources/powder.desktop $out/share/applications + mv ./resources/powder.desktop $out/share/applications mv ../resources $out/share ''; -- cgit 1.4.1