diff options
| author | Bobby Rong <rjl931189261@126.com> | 2022-01-06 13:15:49 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-06 13:15:49 +0800 |
| commit | 3342c9f8bf92d62df208146f88c658798405cafb (patch) | |
| tree | da0dcb2994c506aadb2c1e319b9e29ff44ae877a | |
| parent | a1f94f18723e0b5b97d6ba129480bdba659a4302 (diff) | |
| parent | 0762a3f4416efa73d09ebabb14b25d4f8eceba6e (diff) | |
Merge pull request #153370 from DeeUnderscore/widelands-boost-1.77
widelands: fix building with boost 1.77
| -rw-r--r-- | pkgs/games/widelands/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/games/widelands/default.nix b/pkgs/games/widelands/default.nix index f094c7cd59616..f53b3deaef493 100644 --- a/pkgs/games/widelands/default.nix +++ b/pkgs/games/widelands/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , SDL2 , SDL2_image , SDL2_mixer @@ -32,7 +33,14 @@ stdenv.mkDerivation rec { 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 = '' substituteInPlace xdg/org.widelands.Widelands.desktop \ |