freeorion: fix build #36659
Merged
freeorion: fix build #36659
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
currently |
|
ok, the upstream patch didn't apply properly (and caused build failures), so I patched the stuff manually for the stable version (the fix is in upstream only available for |
|
Out of curiosity which patch did you try? I was about to submit a PR for this package when I saw yours so didn't bother in the end but had it working locally by fetching from upstream's GitHub. Here's my diff FWIW: diff --git a/pkgs/games/freeorion/default.nix b/pkgs/games/freeorion/default.nix
index 3d7e132e612..feef4c9ad11 100644
--- a/pkgs/games/freeorion/default.nix
+++ b/pkgs/games/freeorion/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, doxygen, graphviz, makeWrapper
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, doxygen, graphviz, makeWrapper
, boost, SDL2, python2, freetype, openal, libogg, libvorbis, zlib, libpng, libtiff, libjpeg, libGLU_combined, glew, libxslt }:
stdenv.mkDerivation rec {
@@ -20,6 +20,11 @@ stdenv.mkDerivation rec {
patches = [
./fix_rpaths.patch
+ # fix build with boost 1.66
+ (fetchpatch {
+ url = https://github.com/freeorion/freeorion/commit/c9b5b13fb81b1ed142dee0e843101c6b8832ca95.patch;
+ sha256 = "0agqhxk8462sgd230lmdzbrbrfd77zyy7a4g8hrf28zxza1nza94";
+ })
];
postInstall = '' |
|
Fetching the patch from Github if it applies is more preferable. |
`boost::system::posix_error` is deprecated since v1.37, however the default Boost version in NixOS is 1.66. The following upstream patch fixed the issue: freeorion/freeorion@c9b5b13 See ticket NixOS#36453
|
@GrahamcOfBorg build freeorion |
|
Success on x86_64-linux (full log) Attempted: freeorion Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: freeorion Partial log (click to expand)
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
boost::system::posix_erroris deprecated since v1.37, however thedefault Boost version in NixOS is 1.66.
(see freeorion/freeorion@c9b5b13)
The issue has been fixed on master, but isn't backported yet, so it
should be sufficient to manually include the patch in our build.
See ticket #36453
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)