mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 15:03:28 +00:00
lzwolf: fix the build against gcc-13
Without the change build fails against `gcc-13` on `master` as https://hydra.nixos.org/build/246520454: In file included from /build/source/src/actor.h:40, from /build/source/src/g_blake/a_smartanim.cpp:36: /build/source/src/gamemap.h:255:64: error: 'std::uint16_t' has not been declared 255 | void OperateConcession(std::uint16_t concession); | ^~~~~~~~
This commit is contained in:
parent
19f815760d
commit
05a57af125
@ -1,6 +1,7 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromBitbucket
|
||||
, fetchpatch
|
||||
, p7zip
|
||||
, cmake
|
||||
, SDL2
|
||||
@ -26,6 +27,16 @@ stdenv.mkDerivation rec {
|
||||
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 = ''
|
||||
# SDL2_net-2.2.0 changed CMake component name slightly.
|
||||
substituteInPlace src/CMakeLists.txt \
|
||||
|
Loading…
Reference in New Issue
Block a user