talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

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

Browse Source
This commit is contained in:
Sandro Jäckel 2025-01-15 00:51:06 +01:00
parent be96678fad
commit ac72e70505
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/games/0ad/game.nix
View File

@ -10,7 +10,7 @@
libidn, libidn,
pkg-config, pkg-config,
spidermonkey_78, spidermonkey_78,
boost, boost183,
icu, icu,
libxml2, libxml2,
libpng, libpng,
@ -43,7 +43,7 @@
let let
# the game requires a special version 78.6.0 of spidermonkey, otherwise # the game requires a special version 78.6.0 of spidermonkey, otherwise
# we get compilation errors. We override the src attribute of spidermonkey_78 # 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 { spidermonkey_78_6 = spidermonkey_78.overrideAttrs (old: rec {
version = "78.6.0"; version = "78.6.0";
src = fetchurl { src = fetchurl {
@ -72,7 +72,9 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
spidermonkey_78_6 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 icu
libxml2 libxml2
libpng libpng
@ -106,6 +108,8 @@ stdenv.mkDerivation rec {
"-I${SDL2}/include/SDL2" "-I${SDL2}/include/SDL2"
"-I${fmt.dev}/include" "-I${fmt.dev}/include"
"-I${nvidia-texture-tools.dev}/include" "-I${nvidia-texture-tools.dev}/include"
# TODO: drop with next update
"-Wno-error=implicit-function-declaration"
]; ];
NIX_CFLAGS_LINK = toString [ NIX_CFLAGS_LINK = toString [