mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-19 16:45:49 +01:00
Merge pull request #153370 from DeeUnderscore/widelands-boost-1.77
widelands: fix building with boost 1.77
This commit is contained in:
commit
3342c9f8bf
1 changed files with 9 additions and 1 deletions
|
@ -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 \
|
||||||
|
|
Loading…
Reference in a new issue