Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

zeroad: pin boost183 and allow implicit-function-declaration to fix build #373889

Merged
merged 1 commit into from
Jan 17, 2025
+7 −3
Merged

zeroad: pin boost183 and allow implicit-function-declaration to fix build #373889

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions pkgs/games/0ad/game.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
libidn,
pkg-config,
spidermonkey_78,
boost,
boost183,
icu,
libxml2,
libpng,
Expand Down Expand Up @@ -43,7 +43,7 @@
let
# the game requires a special version 78.6.0 of spidermonkey, otherwise
# we get compilation errors. We override the src attribute of spidermonkey_78
# in order to reuse that declartion, while giving it a different source input.
# in order to reuse that declaration, while giving it a different source input.
spidermonkey_78_6 = spidermonkey_78.overrideAttrs (old: rec {
version = "78.6.0";
src = fetchurl {
Expand Down Expand Up @@ -72,7 +72,9 @@ stdenv.mkDerivation rec {

buildInputs = [
spidermonkey_78_6
boost
# boost 1.86 fails with the following error:
# error: 'boost::filesystem::wpath' {aka 'class boost::filesystem::path'} has no member named 'leaf'
boost183
icu
libxml2
libpng
Expand Down Expand Up @@ -106,6 +108,8 @@ stdenv.mkDerivation rec {
"-I${SDL2}/include/SDL2"
"-I${fmt.dev}/include"
"-I${nvidia-texture-tools.dev}/include"
# TODO: drop with next update
"-Wno-error=implicit-function-declaration"
];

NIX_CFLAGS_LINK = toString [
Expand Down