endless-sky: 0.10.10 -> 0.10.12

[TheGiraffe3]

Updated Endless Sky to 0.10.12, which was released about a month ago.
endless-sky/endless-sky@v0.10.10...v0.10.12

Things done

Thanks to momeemt:

• 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:
  • 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/)
• 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.

[TheGiraffe3]

I'm honestly not sure what the issue is here. Does Nix use a different SHA from all the other distributions?

[momeemt]

Could you fix the pr title and commit message endless-sky: 0.10.10->0.10.12 to endless-sky: 0.10.10 -> 0.10.12?

[TheGiraffe3]

Worth noting that rian hasn't had any contributions since November. Ought someone else (probably me) become the maintainer if @360ied doesn't respond within a reasonable time?

[TheGiraffe3]

This is waiting on @360ied, correct?

[momeemt]

LGTM. You are also free to add yourself to the maintainers of packages you are interested in.

[FliegendeWurst]

I'm honestly not sure what the issue is here. Does Nix use a different SHA from all the other distributions?

Nix uses a content hash here, and the hash is formatted as SRI hash. So yes, the upstream SHA is not directly applicable.

[FliegendeWurst]

Oh, the patch needs updating.

Would it be possible to override these entries in Files.cpp at build time?

static const string LOCAL_PATH = "/usr/local/";
static const string STANDARD_PATH = "/usr/";

[TheGiraffe3]

I'm not sure what you mean?
The patch file seems to remove those lines, so I updated the patch with the new changes; does that resolve your comment?

[FliegendeWurst]

I meant a build option to set the prefix, overriding both of these variables.

[FliegendeWurst]

Though an updated patch also works.

[TheGiraffe3]

An updated patch like the one currently modified or a patch to add another build option? The latter I'm not sure I'm proficient enough to add.

[FliegendeWurst]

Adding a build option via a patch would bring little value. So yes, as you did here. Though it seems your updated patch is malformed?

[TheGiraffe3]

I copied the current entry in Files.cpp in that area and added - signs in front of it. Are you referring to the commit information at the top?

[FliegendeWurst]

No, I am referring to:

applying patch /nix/store/9bg70lmjqb8z40nhx3fjqfwcy19pvs0r-fixes.patch
patching file SConstruct
Hunk #1 succeeded at 196 with fuzz 1 (offset 141 lines).
patching file source/Files.cpp
patch: **** malformed patch at line 51: -       }

[FliegendeWurst]

applying patch /nix/store/n503dxqvqwx31p4zlakrm9yvcrbh7yz0-fixes.patch
patching file SConstruct
Hunk #1 succeeded at 196 with fuzz 1 (offset 141 lines).
patching file source/Files.cpp
patch: **** malformed patch at line 54:         }

[FliegendeWurst]

applying patch /nix/store/fayh6n9q10d9mj5hi1impygrc9q2nk4v-fixes.patch
patching file SConstruct
Hunk #1 succeeded at 196 with fuzz 1 (offset 141 lines).
patching file source/Files.cpp
patch: **** malformed patch at line 54:         dataPath = resources + "data/";

The easiest way to create a correct patch is to git checkout the source code, make the changes, and run git diff > the-patch.patch.

[FliegendeWurst]

The new patch is well-formed but fails to apply. I think a minimal patch would be better, to avoid future conflicts.

diff --git a/source/Files.cpp b/source/Files.cpp
index f5dec21..ad57c55 100644
--- a/source/Files.cpp
+++ b/source/Files.cpp
@@ -115,6 +115,7 @@ void Files::Init(const char * const *argv)
 		else if(IsParent(STANDARD_PATH, resources))
 			resources = STANDARD_PATH / RESOURCE_PATH;
 #endif
+		resources = "%NIXPKGS_RESOURCES_PATH%";
 	}
 	// If the resources are not here, search in the directories containing this
 	// one. This allows, for example, a Mac app that does not actually have the

[TheGiraffe3]

I'm sorry for all the trouble about this PR.