tunnelx: minor refactor and cleanup

[drupol]

Follow up of #239739

Description of changes

Things done

• Built on platform(s)
  • x86_64-linux
  • aarch64-linux
  • x86_64-darwin
  • aarch64-darwin
• For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
• Tested, as applicable:
  • NixOS test(s) (look inside nixos/tests)
  • and/or package tests
  • or, for functions and "core" functionality, tests in lib/tests or pkgs/test
  • made sure NixOS tests are linked to the relevant packages
• 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/)
• 23.11 Release Notes (or backporting 23.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.

[drupol]

@NixOS/darwin-maintainers I would like some help with this derivation. I'm pretty sure it's possible to run it on Darwin.

@goatchurchprime Could you confirm it works on Darwin architecture?

[drupol]

From @Cu3PO42

The log states that the Mesa package is marked as broken on Mac. The package definition references this issue: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8634 which does not appear to be resolved yet.

I'll set platforms to Linux only.

[emilazy]

I do not believe Mesa should be required for this package on macOS from what I'm seeing. Investigating now though.

[drupol]

Thanks :)

[emilazy]

This package builds but I worry I may have broken the GUI components of survex in the process. I'm afraid I've never gone caving outside of Colossal Cave Adventure before; could you tell me how to exercise tunnelx's dependencies on those binaries?

[reckenrode]

There’s also a tracking issue for Mesa on Darwin.

#233265

[drupol]

I have no clue, maybe @goatchurchprime can help ?

[emilazy]

Okay, I source dived and checked the survex executables tunnelx uses; they all start with this patch, even the aven GUI. Can't guarantee that this hasn't broken something on the survex side but it's clearly an improvement over the status quo; I'm going to call this good enough:

diff --git a/pkgs/applications/gis/tunnelx/default.nix b/pkgs/applications/gis/tunnelx/default.nix
index 174796b3bf5..21cc485e752 100644
--- a/pkgs/applications/gis/tunnelx/default.nix
+++ b/pkgs/applications/gis/tunnelx/default.nix
@@ -36,9 +36,10 @@ stdenv.mkDerivation (finalAttrs: {
 
     mkdir -p $out/bin $out/java
     cp -r symbols Tunnel tutorials $out/java
+    # `SURVEX_EXECUTABLE_DIR` must include trailing slash
     makeWrapper ${jre}/bin/java $out/bin/tunnelx \
       --add-flags "-cp $out/java Tunnel.MainBox" \
-      --set SURVEX_EXECUTABLE_DIR ${lib.getBin survex}/bin \
+      --set SURVEX_EXECUTABLE_DIR ${lib.getBin survex}/bin/ \
       --set TUNNEL_USER_DIR $out/java/
 
     runHook postInstall
diff --git a/pkgs/applications/misc/survex/default.nix b/pkgs/applications/misc/survex/default.nix
index b23cd02220b..6f2098ea477 100644
--- a/pkgs/applications/misc/survex/default.nix
+++ b/pkgs/applications/misc/survex/default.nix
@@ -45,14 +45,16 @@ stdenv.mkDerivation rec {
   buildInputs = [
     ffmpeg
     glib
-    libGLU
-    mesa
     proj
     wxGTK32
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
     Carbon
     Cocoa
   ] ++ lib.optionals stdenv.hostPlatform.isLinux [
+    # TODO: libGLU doesn't build for macOS because of Mesa issues
+    # (#233265); is it required for anything?
+    libGLU
+    mesa
     libICE
     libX11
   ];

[MatthewCroughan]

Unbelievable work, completely unexpected and brilliant. Thank you so much!

[drupol]

I was feeling a little bit concerned for merging the related pr too quickly and noticing too late that I missed plenty of things to do ... And in the meantime, the Darwin maintainers improved the Darwin support :)