odamex: 0.9.5 -> 11.1.1; add eljamm to maintainers

[eljamm]

So I may have forgotten to check for already-open PRs when I started working on this, but I think the result is good enough that it can probably supersede:

• odamex: 0.9.5 -> 11.0.0 #388093
• odamex: 0.9.5 -> 11.1.1 #457213
• odamex: 0.9.5 -> 11.0.0 #432760 (I took the desktop files from this PR, also from upstream)

Tested Odamex with Freedoom, and although I didn't find any active players, everything seemed to be working fine.

ZHF: #457852

Things done

• Built on platform:
  • x86_64-linux
  • aarch64-linux
  • x86_64-darwin
  • aarch64-darwin
• Tested, as applicable:
  • NixOS tests in nixos/tests.
  • Package tests at passthru.tests.
  • Tests in lib/tests or pkgs/test for functions and "core" functionality.
• Ran nixpkgs-review on this PR. See nixpkgs-review usage.
• Tested basic functionality of all binary files, usually in ./result/bin/.
• Nixpkgs Release Notes
  • Package update: when the change is major or breaking.
• NixOS Release Notes
  • Module addition: when adding a new NixOS module.
  • Module update: when the change is significant.
• Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

---

Add a 👍 reaction to pull requests you find important.

[eljamm]

nixpkgs-review result

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 459626
Commit: cb5457a6b260d6b1772161e1f4add4c3a7b508a3 (subsequent changes)
Merge: ff7c5fd0417d3a26776e4bac71e12a9af2a7f001

Logs: https://github.com/eljamm/nixpkgs-review-gha/actions/runs/19190006064

---

x86_64-linux

✅ 1 package built:

• odamex

---

aarch64-linux

✅ 1 package built:

• odamex

---

x86_64-darwin (sandbox = true)

❌ 1 package failed to build:

• odamex

---

aarch64-darwin (sandbox = true)

❌ 1 package failed to build:

• odamex

[eljamm]

This fails to build on Darwin because of broken cpptrace tests, likely because the current version of libdwarf is too new for cpptrace. Tried to build the internal cpptrace on Darwin, but libdwarf headers are missing. This shouldn't be a blocker, though, since this will be fixed when cpptrace is bumped.

We could also temporarily disable cpptrace tests on Darwin, but we'll need someone with a machine to properly test Odamex.

[iedame]

I can test on aarch64-darwin if you choose to disable the test.

[iedame]

I did some testing and I was unable to change the iwad directory through the interface, many buttons didn't do anything and return error 2 in terminal. I set up the iwad directory using the env variable but still got error 2.
Looks like it is broken on darwin unfortunately.

[eljamm]

nixpkgs-review result

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 459626
Commit: 10cc199e1ebeaab348b063fb0615a1a2acbd51ab (subsequent changes)
Merge: 8fb8b4f03934b70303a19bfee53d90113ec622ff

Logs: https://github.com/eljamm/nixpkgs-review-gha/actions/runs/19190517598

---

x86_64-linux

✅ 1 package built:

• odamex

---

aarch64-linux

✅ 1 package built:

• odamex

---

x86_64-darwin (sandbox = true)

✅ 1 package built:

• odamex

---

aarch64-darwin (sandbox = true)

✅ 1 package built:

• odamex

[eljamm]

I did some testing and I was unable to change the iwad directory through the interface, many buttons didn't do anything and return error 2 in terminal. I set up the iwad directory using the env variable but still got error 2.

Did you set the Odamex directory? You can either do it from the settings, or change OdamexDirectory in ~/.odalaunch to point to /run/current-system/sw/bin/ if you installed Odamex in your system, or /absolute/path/to/build/result/bin. You may have to restart the launcher after you do this, for the changes to take effect. Then, the orange button at the top-left should start the client and show you the WADs:

[eljamm]

Now, the launcher should automatically point to bin directory with ODAMEX_INSTALL_BINDIR, so you don't have to do the steps mentioned above to test. You only need to add the WAD directories.

[iedame]

execvp(/nix/store/112cmdzqzw5shj7rrci269nw0dxqs3ra-odamex-11.1.1/bin/odamex.app/Contents/MacOS/odamex, -waddir, ~/wad:) failed with error 2!
execvp(/nix/store/112cmdzqzw5shj7rrci269nw0dxqs3ra-odamex-11.1.1/bin/odamex.app/Contents/MacOS/odamex, -waddir, ~/wad:) failed with error 2!

this error have a strange path, because I have:
/nix/store/112cmdzqzw5shj7rrci269nw0dxqs3ra-odamex-11.1.1/bin/odalaunch
/nix/store/112cmdzqzw5shj7rrci269nw0dxqs3ra-odamex-11.1.1/Applications/odalaunch.app

my odamex directory is set as /nix/store/112cmdzqzw5shj7rrci269nw0dxqs3ra-odamex-11.1.1/bin

Regarding the interface issues, I found this:
odamex/odamex#1399 that maybe can be patched with odamex/odamex#1402

[iedame]

Yeah, the mac installPhase is missing the other apps, I included odamex.app and now I see that odamex screen

[iedame]

[iedame]

Which executables do you have on linux? I'm not familiar with odamex so I'm not sure if only odalaunch and odamex are needed.
This is what I did to get it working: patched the GUI fix I linked in previous comment, included in installPhase the odamex.app and changed odamex bindir to Applications, since it looks for odamex.app/Contents/MacOS/odamex

[eljamm]

Which executables do you have on linux?

I have odalaunch, odamex and odasrv.

included in installPhase the odamex.app

Is it under odamex/odamex.app? Because I tried to copy that and it failed for some reason.

[iedame]

client/odamex.app, and I think odasrv is under server/odasrv but I didn't include that yet so need to confirm.

Considering the GUI patch only mentions ag-odalaunch, odalaunch and odamex I believe odasrv doesn't have an .app, just the executable

[eljamm]

@iedame could you please test again? specifically, I'd like to know if ODAMEX_BINDIR works on Darwin. You should delete the launcher's previous config file (rm ~/.odalaunch) and start fresh.

Edit: The server should be working fine under Darwin. For the record, I've been building and testing this on a macos GitHub runner with nixpkgs-review-gha, which is currently limited to the console, but is better than nothing.

[iedame]

I found the config file in /Library/Preferences/, it seems to work just fine now!

@NixOS/darwin-maintainers anyone can help test/review this on darwin please?

[keenanweaver]

Thank you so much for doing this! Also closes #330272

I do get this crash on odalaunch, but it's probably something I'm doing in my config.

(odalaunch:154509): GLib-GIO-ERROR **: 07:11:24.223: No GSettings schemas are installed on the system
Trace/breakpoint trap      (core dumped) odalaunch

The Flatpak version works.

odasrv can't find IWADs, but the Flatpak version does the same thing.

[thunze]

Also tracking here: #459759

[Aleksanaa]

I do get this crash on odalaunch, but it's probably something I'm doing in my config.

gappsWrapperArgs? @eljamm

[eljamm]

I do get this crash on odalaunch, but it's probably something I'm doing in my config.

@keenanweaver could you try again?

odasrv can't find IWADs, but the Flatpak version does the same thing.

Yes, but you can pass them as an argument or with an env var.

[keenanweaver]

@keenanweaver could you try again?

Everything is working perfectly now. Thanks!

[electricbrass]

I did some testing and I was unable to change the iwad directory through the interface, many buttons didn't do anything and return error 2 in terminal. I set up the iwad directory using the env variable but still got error 2. Looks like it is broken on darwin unfortunately.

The issue with some of the buttons in that gui being non-functional was an upstream bug that has since been fixed, the should be in the next release.

I do get this crash on odalaunch, but it's probably something I'm doing in my config.

I don't know for sure on this crash, but Odalaunch can be unstable with newer versions of wxWidgets. The Flatpak includes an older wxWidgets 3.0.5 for this reason. Odalaunch is essentially unmaintained at this point unfortunately.

[iedame]

The issue with some of the buttons in that gui being non-functional was an upstream bug that has since been fixed, the should be in the next release.

Yes, the patch includes those changes and it works correctly with the patch applied.

[electricbrass]

Ah, missed that bit of the discussion!