Merge pull request #153370 from DeeUnderscore/widelands-boost-1.77

widelands: fix building with boost 1.77
This commit is contained in:
Bobby Rong 2022-01-06 13:15:49 +08:00 committed by GitHub
commit 3342c9f8bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,6 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, SDL2 , SDL2
, SDL2_image , SDL2_image
, SDL2_mixer , SDL2_mixer
@ -32,7 +33,14 @@ stdenv.mkDerivation rec {
sha256 = "sha256-gNumYoeKePaxiAzrqEPKibMxFwv9vyBrCSoua+MKhcM="; sha256 = "sha256-gNumYoeKePaxiAzrqEPKibMxFwv9vyBrCSoua+MKhcM=";
}; };
patches = [ ./bincmake.patch ]; patches = [
./bincmake.patch
# fix for building with Boost 1.77, https://github.com/widelands/widelands/pull/5025
(fetchpatch {
url = "https://github.com/widelands/widelands/commit/33981fda8c319c9feafc958f5f0b1670c48666ef.patch";
sha256 = "sha256-FjxxCTPpg/Zp01XpNfgRXMMLJBfxAptkLpsLmnFXm2Q=";
})
];
postPatch = '' postPatch = ''
substituteInPlace xdg/org.widelands.Widelands.desktop \ substituteInPlace xdg/org.widelands.Widelands.desktop \