zeroad: 0.0.23b -> 0.0.24b #114031

nagy · 2021-02-22T20:12:30Z

Motivation for this change

This unbreaks and updates the game but it depends on #114030 .
More on why that patch to spidermonkey is needed can be read here:
https://wildfiregames.com/forum/topic/33893-spidermonkey-68-78-upgrade/

Once that PR has been merged, I will unmark the draft status of this. Any automatic build will likely fail but that should resolve once that has been merged.

Things done

r-rmcgibbo · 2021-02-22T20:40:12Z

Result of nixpkgs-review pr 114031 at abeb2bc5 run on x86_64-linux 1

1 package failed to build:

zeroad

pkgs/games/0ad/data.nix

chvp

I had to add a sourceRoot = "."; to 0ad/data.nix to make this work. Also, did you check whether this version of 0ad builds with gcc10? The stdenv was set to gcc9 manually when the default changed because 0.0.23 didn't with build with 10, but I would assume that that isn't the case for 0.0.24.

nagy · 2021-02-24T18:10:42Z

I had to add a sourceRoot = "."; to 0ad/data.nix to make this work.

What do you mean? This is added in line 12 of the file.

Also, did you check whether this version of 0ad builds with gcc10? The stdenv was set to gcc9 manually when the default changed because 0.0.23 didn't with build with 10, but I would assume that that isn't the case for 0.0.24.

I did not. But once the spidermonkey PR is merged I have to review this again, then i will test gcc10.

chvp · 2021-02-24T18:17:20Z

What do you mean? This is added in line 12 of the file.

Oh, I'm blind apparently. Sorry about the noise.

mfsch · 2021-02-25T13:09:06Z

There’s also a slightly newer release "Alpha 24b" on the download page. I couldn’t find any info on what has been changed with respect to the first "Alpha 24" release, but it’s probably a good idea to update to the latest version.

Also, when I wrote my own derivation for this new Alpha, I had to change wxGTK to wxGTK31 since I got an error that only wxWidgets >= 3.0 was supported, but apparently it is working with v2.8 for you?

Finally, is it a good idea to remove the patch for the minor version check? From what I understand, that would mean that any update of spidermonkey_78 to a version != 78.6 would break the 0 A.D. build.

nagy · 2021-02-25T14:34:45Z

Also, when I wrote my own derivation for this new Alpha, I had to change wxGTK to wxGTK31 since I got an error that only wxWidgets >= 3.0 was supported, but apparently it is working with v2.8 for you?

I was able to get the game started. I did not test much further than that. Do you get a compilation error ?

Finally, is it a good idea to remove the patch for the minor version check? From what I understand, that would mean that any update of spidermonkey_78 to a version != 78.6 would break the 0 A.D. build.

I have something prepared for that.

chvp · 2021-02-25T14:49:21Z

I played two games last night using this pull request (and #114030), so I did not have problems with wxGTK.

nagy · 2021-02-25T17:11:31Z

There’s also a slightly newer release "Alpha 24b" on the download page. I couldn’t find any info on what has been changed with respect to the first "Alpha 24" release, but it’s probably a good idea to update to the latest version.

This here is the change between the two versions: 0ad/0ad@A24...A24b
Looks mostly like language updates but it should not hurt to update to that.

pkgs/games/0ad/data.nix

nagy · 2021-02-28T18:21:22Z

The spidermonkey PR has since been merged (into staging). However it is not the exact same version that 0ad requires. Therefore I had to put in a little workaround to that. We are now building a new derivation of spidermonkey with a patched src attribute. Without this, we get compilation errors.

0ad also ships with this version of spidermonkey, however I would prefer the current way of doing it over building the shipped version of spidermonkey, because this way we do not need to redeclare all of spidermonkeys dependencies in this derivation.

Because spidermonkey has still not arrived in master, any automatic build will fail again. I am however removing the draft status of this, since the problem should resolve once it hits master.

pkgs/games/0ad/game.nix

chvp · 2021-02-28T18:34:33Z

pkgs/games/0ad/game.nix

+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.


I wonder if this is the correct solution. The second patch in the derivation for 0.0.23b removed the minor version check, so maybe that's the correct solution here as well.

No, i tried to remove that check already and it gives a compilation error.

The Fedora patch contains two changes – if you remove the second change, which seems no longer necessary, and perhaps fix the line numbers to @@ -81,19 +81,6 @@ it does apply. But I tend to agree that your solution of overriding the spidermonkey_78 version is better, since 78.6 is the version that is tested by the 0 A.D. devs.

mfsch · 2021-03-01T16:13:26Z

Also, when I wrote my own derivation for this new Alpha, I had to change wxGTK to wxGTK31 since I got an error that only wxWidgets >= 3.0 was supported, but apparently it is working with v2.8 for you?

I was able to get the game started. I did not test much further than that. Do you get a compilation error ?

I just saw that this is done in all-packages.nix.

chvp · 2021-03-19T22:27:06Z

The spidermonkey change necessary for this PR was merged to master a few hours ago. I'm getting a build failure for spidermonkey 78.6.0:

make[3]: Entering directory '/build/firefox-78.6.0/obj/js/src/rust'
js/src/rust/force-cargo-library-build
/nix/store/0hkwhcpjf1p32p85bc555bpykvh220kz-cargo-1.50.0/bin/cargo rustc  --release --manifest-path /build/firefox-78.6.0/js/src/rust/Cargo.toml -vv --lib --target=x86_64-unknown-linux-gnu  --  -Clto
error: failed to parse manifest at `/build/firefox-78.6.0/Cargo.toml`

Caused by:
  dependency (nix) specification is ambiguous. Only one of `branch`, `tag` or `rev` is allowed.
make[3]: *** [/build/firefox-78.6.0/config/makefiles/rust.mk:299: force-cargo-library-build] Error 101
make[3]: Leaving directory '/build/firefox-78.6.0/obj/js/src/rust'
make[2]: *** [/build/firefox-78.6.0/config/recurse.mk:74: js/src/rust/target] Error 2
make[2]: Leaving directory '/build/firefox-78.6.0/obj'
make[1]: *** [/build/firefox-78.6.0/config/recurse.mk:34: compile] Error 2
make[1]: Leaving directory '/build/firefox-78.6.0/obj'
make: *** [/build/firefox-78.6.0/config/rules.mk:390: default] Error 2

chvp · 2021-03-20T13:00:09Z

I was able to fix the build error by adding the following patch to the spidermonkey_78_6 derivation: https://github.com/chvp/nixpkgs/blob/a1a03554af1186669a645609e25a9476f267280b/pkgs/games/0ad/spidermonkey-cargo-toml.patch

nagy · 2021-03-20T14:29:44Z

@chvp thanks for the patch. I can happily apply it, but i would also like to understand why this is only needed for the 78.6.0 version and not the 78.8.0 one. Do you happen to know why ?

chvp · 2021-03-20T14:33:42Z

The branch, tag or rev uniqueness requirement was added in cargo 1.50 (which was also part of this staging cycle, AFAICT): https://github.com/rust-lang/cargo/blob/master/CHANGELOG.md#cargo-150-2021-02-11
The tarball for 78.8.0 contains a compliant Cargo.toml, the tarball for 78.6.0 doesn't.

nagy · 2021-03-20T17:02:52Z

Updated. It builds for me locally as well.

chvp

Started a game using this exact patch, and I've played at least 10 games using some version of this patch over the past few weeks.

SuperSandro2000 · 2021-03-20T23:40:58Z

pkgs/games/0ad/game.nix

  };

  nativeBuildInputs = [ python2 perl pkg-config ];

  buildInputs = [
-    spidermonkey_38 boost icu libxml2 libpng libjpeg


Maybe we can now drop spidermonkey_38.

ofborg bot added 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Feb 22, 2021

SuperSandro2000 requested changes Feb 23, 2021

View reviewed changes

pkgs/games/0ad/data.nix Outdated Show resolved Hide resolved

chvp suggested changes Feb 24, 2021

View reviewed changes

zeri42 mentioned this pull request Feb 25, 2021

0ad A24b building now #114386

Closed

10 tasks

SuperSandro2000 requested changes Feb 26, 2021

View reviewed changes

pkgs/games/0ad/data.nix Outdated Show resolved Hide resolved

nagy force-pushed the zeroad branch from abeb2bc to 5832bfe Compare February 28, 2021 18:16

nagy changed the title ~~zeroad: 0.0.23b -> 0.0.24~~ zeroad: 0.0.23b -> 0.0.24b Feb 28, 2021

nagy marked this pull request as ready for review February 28, 2021 18:21

chvp suggested changes Feb 28, 2021

View reviewed changes

nagy force-pushed the zeroad branch from 5832bfe to e9e293a Compare February 28, 2021 19:17

nagy and others added 2 commits March 20, 2021 15:35

zeroad: 0.0.23b -> 0.0.24b

9815ef3

zeroad: fix build of spidermonkey derivation

a410e5d

nagy force-pushed the zeroad branch from e9e293a to a410e5d Compare March 20, 2021 17:00

chvp approved these changes Mar 20, 2021

View reviewed changes

SuperSandro2000 merged commit 9e99491 into NixOS:master Mar 21, 2021

SuperSandro2000 reviewed Mar 21, 2021

View reviewed changes

nagy deleted the zeroad branch March 21, 2021 10:14

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

zeroad: 0.0.23b -> 0.0.24b #114031

zeroad: 0.0.23b -> 0.0.24b #114031

nagy commented Feb 22, 2021 •

edited

Loading

r-rmcgibbo commented Feb 22, 2021

chvp left a comment

nagy commented Feb 24, 2021 •

edited

Loading

chvp commented Feb 24, 2021

mfsch commented Feb 25, 2021

nagy commented Feb 25, 2021

chvp commented Feb 25, 2021 •

edited

Loading

nagy commented Feb 25, 2021

nagy commented Feb 28, 2021

chvp Feb 28, 2021

nagy Feb 28, 2021

mfsch Mar 1, 2021 •

edited

Loading

mfsch commented Mar 1, 2021

chvp commented Mar 19, 2021 •

edited

Loading

chvp commented Mar 20, 2021

nagy commented Mar 20, 2021

chvp commented Mar 20, 2021

nagy commented Mar 20, 2021

chvp left a comment

SuperSandro2000 Mar 20, 2021

nagy Mar 21, 2021

zeroad: 0.0.23b -> 0.0.24b #114031

zeroad: 0.0.23b -> 0.0.24b #114031

Conversation

nagy commented Feb 22, 2021 • edited Loading

Motivation for this change

Things done

r-rmcgibbo commented Feb 22, 2021

chvp left a comment

Choose a reason for hiding this comment

nagy commented Feb 24, 2021 • edited Loading

chvp commented Feb 24, 2021

mfsch commented Feb 25, 2021

nagy commented Feb 25, 2021

chvp commented Feb 25, 2021 • edited Loading

nagy commented Feb 25, 2021

nagy commented Feb 28, 2021

chvp Feb 28, 2021

Choose a reason for hiding this comment

nagy Feb 28, 2021

Choose a reason for hiding this comment

mfsch Mar 1, 2021 • edited Loading

Choose a reason for hiding this comment

mfsch commented Mar 1, 2021

chvp commented Mar 19, 2021 • edited Loading

chvp commented Mar 20, 2021

nagy commented Mar 20, 2021

chvp commented Mar 20, 2021

nagy commented Mar 20, 2021

chvp left a comment

Choose a reason for hiding this comment

SuperSandro2000 Mar 20, 2021

Choose a reason for hiding this comment

nagy Mar 21, 2021

Choose a reason for hiding this comment

nagy commented Feb 22, 2021 •

edited

Loading

nagy commented Feb 24, 2021 •

edited

Loading

chvp commented Feb 25, 2021 •

edited

Loading

mfsch Mar 1, 2021 •

edited

Loading

chvp commented Mar 19, 2021 •

edited

Loading