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.

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

Conversation

SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Jan 14, 2025

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@SuperSandro2000 SuperSandro2000 requested a review from astro January 14, 2025 23:53
@SuperSandro2000 SuperSandro2000 changed the title zeroad: pin boost183 and allow implicit-function-declaration to fix b… zeroad: pin boost183 and allow implicit-function-declaration to fix build Jan 14, 2025
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Jan 15, 2025
@nix-owners nix-owners bot requested a review from chvp January 15, 2025 00:01
@emilazy
Copy link
Member

emilazy commented Jan 15, 2025

Does it have to be 1.83? I just dealt with all the other uses of that. It looks like it was building until recently, so boost186 should work?

@SuperSandro2000
Copy link
Member Author

It doesn't build with 1.86 because a deprecated leaf() method got removed and all-packages.nix revealed that as the next lower version.

@SuperSandro2000
Copy link
Member Author

SuperSandro2000 commented Jan 16, 2025

Thats the error with boost 1.86

0ad> OverlayRenderer.cpp
0ad> ParticleRenderer.cpp
0ad> PatchRData.cpp
0ad> PostprocManager.cpp
0ad> RenderModifiers.cpp
0ad> Renderer.cpp
0ad> ../../../source/graphics/TextureManager.cpp: In member function 'CTextureConverter::Settings CTextureManagerImpl::GetConverterSettings(const CTexturePtr&)':
0ad> ../../../source/graphics/TextureManager.cpp:788:87: error: 'boost::filesystem::wpath' {aka 'class boost::filesystem::path'} has no member named 'leaf'
0ad>   788 |                 return m_TextureConverter.ComputeSettings(GetWstringFromWpath(srcPath.leaf()), files);
0ad>       |                                                                                       ^~~~
0ad> RenderingOptions.cpp
0ad> Scene.cpp
0ad> SceneRenderer.cpp
0ad> ShadowMap.cpp
0ad> SilhouetteRenderer.cpp
0ad> SkyManager.cpp
0ad> TerrainOverlay.cpp
0ad> TerrainRenderer.cpp
0ad> TexturedLineRData.cpp

@SuperSandro2000
Copy link
Member Author

Assuming that question got answered and since multiple people have asked me to fix zeroad I am going ahead and merging this.

@SuperSandro2000 SuperSandro2000 merged commit e68a04c into NixOS:master Jan 17, 2025
25 of 27 checks passed
@SuperSandro2000 SuperSandro2000 deleted the 0ad branch January 17, 2025 20:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: games 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants