Unverified Commit 785fe8ef authored by éclairevoyant's avatar éclairevoyant Committed by GitHub
Browse files

Merge pull request #308815 from LordGrimmauld/powder_update

the-powder-toy: 97.0.352 -> 98.2.365
parents 65d15326 c211e655
Loading
Loading
Loading
Loading
+75 −0
Original line number Diff line number Diff line
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, meson
, ninja
, pkg-config
, python3
, SDL2
, bzip2
, curl
, fftwFloat
, lua
, luajit
, zlib
, jsoncpp
, libpng
, Cocoa }:

{
  bzip2,
  Cocoa,
  copyDesktopItems,
  curl,
  fetchFromGitHub,
  fftwFloat,
  jsoncpp,
  lib,
  libpng,
  lua,
  luajit,
  meson,
  ninja,
  pkg-config,
  SDL2,
  stdenv,
  zlib,
}:
stdenv.mkDerivation rec {
  pname = "the-powder-toy";
  version = "97.0.352";
  version = "98.2.365";

  src = fetchFromGitHub {
    owner = "The-Powder-Toy";
    repo = "The-Powder-Toy";
    rev = "v${version}";
    sha256 = "sha256-LYohsqFU9LBgTXMaV6cf8/zf3fBvT+s5A1JBpPHekH8=";
    rev = "refs/tags/v${version}";
    hash = "sha256-S2aUa25EnUfX6ShW6D+wHrsTLxTcCFcZ/uLE9EWGu4Q=";
  };

  patches = [
    # Fix gcc-13 build failure:
    #   https://github.com/The-Powder-Toy/The-Powder-Toy/pull/898
    (fetchpatch {
      name = "gcc-13.patch";
      url = "https://github.com/The-Powder-Toy/The-Powder-Toy/commit/162bce9a1036e0c233399941410364c4a4370980.patch";
      hash = "sha256-oQNwKemV3BjMLSUd6zMCKqiClcc3Ouxwn3jagf/Q1/I=";
    })
  ];

  nativeBuildInputs = [ meson ninja pkg-config python3 ];
  nativeBuildInputs = [
    meson
    ninja
    pkg-config
  ] ++ lib.optional stdenv.isLinux copyDesktopItems;

  buildInputs = [ SDL2 bzip2 curl fftwFloat lua luajit zlib jsoncpp libpng ]
  ++ lib.optionals stdenv.isDarwin [ Cocoa ];
  buildInputs = [
    bzip2
    curl
    fftwFloat
    jsoncpp
    libpng
    lua
    luajit
    SDL2
    zlib
  ] ++ lib.optional stdenv.isDarwin Cocoa;

  mesonFlags = [ "-Dworkaround_elusive_bzip2=false" ];

  installPhase = ''
    runHook preInstall

    install -Dm 755 powder $out/bin/powder

    mkdir -p $out/share/applications
    mkdir -p $out/share
    mv ../resources $out/share
  '' + lib.optionalString stdenv.isLinux ''
    mv ./resources/powder.desktop $out/share/applications

    runHook postInstall
  '';

  desktopItems = [ "resources/powder.desktop" ];

  meta = with lib; {
    description = "A free 2D physics sandbox game";
    homepage = "https://powdertoy.co.uk/";
    platforms = platforms.unix;
    license = licenses.gpl3Plus;
    maintainers = with maintainers; [ abbradar siraben ];
    maintainers = with maintainers; [
      abbradar
      siraben
    ];
    mainProgram = "powder";
  };
}
+2 −2
Original line number Diff line number Diff line
@@ -37473,8 +37473,8 @@ with pkgs;
  tcl2048 = callPackage ../games/tcl2048 { };
  the-powder-toy = callPackage ../games/the-powder-toy {
    lua = lua5_1;
  the-powder-toy = callPackage ../by-name/th/the-powder-toy/package.nix {
    lua = lua5_2;
    inherit (darwin.apple_sdk.frameworks) Cocoa;
  };