Skip to content

Commit ac72e70

Browse files
zeroad: pin boost183 and allow implicit-function-declaration to fix build
1 parent be96678 commit ac72e70

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

pkgs/games/0ad/game.nix

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
libidn,
1111
pkg-config,
1212
spidermonkey_78,
13-
boost,
13+
boost183,
1414
icu,
1515
libxml2,
1616
libpng,
@@ -43,7 +43,7 @@
4343
let
4444
# the game requires a special version 78.6.0 of spidermonkey, otherwise
4545
# we get compilation errors. We override the src attribute of spidermonkey_78
46-
# in order to reuse that declartion, while giving it a different source input.
46+
# in order to reuse that declaration, while giving it a different source input.
4747
spidermonkey_78_6 = spidermonkey_78.overrideAttrs (old: rec {
4848
version = "78.6.0";
4949
src = fetchurl {
@@ -72,7 +72,9 @@ stdenv.mkDerivation rec {
7272

7373
buildInputs = [
7474
spidermonkey_78_6
75-
boost
75+
# boost 1.86 fails with the following error:
76+
# error: 'boost::filesystem::wpath' {aka 'class boost::filesystem::path'} has no member named 'leaf'
77+
boost183
7678
icu
7779
libxml2
7880
libpng
@@ -106,6 +108,8 @@ stdenv.mkDerivation rec {
106108
"-I${SDL2}/include/SDL2"
107109
"-I${fmt.dev}/include"
108110
"-I${nvidia-texture-tools.dev}/include"
111+
# TODO: drop with next update
112+
"-Wno-error=implicit-function-declaration"
109113
];
110114

111115
NIX_CFLAGS_LINK = toString [

0 commit comments

Comments
 (0)