Merge pull request #287997 from trofi/the-powder-toy-gcc-13-fix

the-powder-toy: fix `gcc-13` build failure
This commit is contained in:
Nick Cao 2024-02-11 10:11:56 -05:00 committed by GitHub
commit ddc385f4b0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -1,6 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, meson , meson
, ninja , ninja
, pkg-config , pkg-config
@ -27,6 +28,16 @@ stdenv.mkDerivation rec {
sha256 = "sha256-LYohsqFU9LBgTXMaV6cf8/zf3fBvT+s5A1JBpPHekH8="; sha256 = "sha256-LYohsqFU9LBgTXMaV6cf8/zf3fBvT+s5A1JBpPHekH8=";
}; };
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 python3 ];
buildInputs = [ SDL2 bzip2 curl fftwFloat lua luajit zlib jsoncpp libpng ] buildInputs = [ SDL2 bzip2 curl fftwFloat lua luajit zlib jsoncpp libpng ]