Merge pull request #283467 from trofi/lzwolf-gcc-13-fix

lzwolf: fix the build against `gcc-13`
This commit is contained in:
Nick Cao 2024-01-24 10:16:59 -05:00 committed by GitHub
commit e242a1529c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1,6 +1,7 @@
{ stdenv { stdenv
, lib , lib
, fetchFromBitbucket , fetchFromBitbucket
, fetchpatch
, p7zip , p7zip
, cmake , cmake
, SDL2 , SDL2
@ -26,6 +27,16 @@ stdenv.mkDerivation rec {
sha256 = "sha256-CtBdvk6LXb/ll92Fxig/M4t4QNj8dNFJYd8F99b47kQ="; sha256 = "sha256-CtBdvk6LXb/ll92Fxig/M4t4QNj8dNFJYd8F99b47kQ=";
}; };
patches = [
# Pull fix pending upstream inclusion for `gcc-13` support:
# https://bitbucket.org/linuxwolf6/lzwolf/pull-requests/5
(fetchpatch {
name = "gcc-13.patch";
url = "https://bitbucket.org/soturi/lzwolf/commits/41f212026dff4f089d1c0921cb49ab1a2b81e0d6/raw";
hash = "sha256-EgSdDaZovD7DyZ0BkuX8ZdsrX7J7v8/D6y5P1NWGJew=";
})
];
postPatch = '' postPatch = ''
# SDL2_net-2.2.0 changed CMake component name slightly. # SDL2_net-2.2.0 changed CMake component name slightly.
substituteInPlace src/CMakeLists.txt \ substituteInPlace src/CMakeLists.txt \