Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

classicube: init at 1.0.7 #67569

Closed
wants to merge 1 commit into from
Closed

Conversation

marius851000
Copy link
Contributor

Motivation for this change

Someone requested classicube, as I had free time, I've done this.

Things done

Tested singleplayer and work well.
Multiplayer untested.

The game write file relative to it's binary, so I move it in ~/.ClassiCube before running it.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@marius851000
Copy link
Contributor Author

@mmahut I've corrected what you said (The patch is from me)

rm -f ~/.ClassiCube/ClassiCubeBin
cp $out/bin/.ClassiCube ~/.ClassiCube/ClassiCubeBin
~/.ClassiCube/ClassiCubeBin
rm -f ~/.ClassiCube/ClassiCubeBin" > $out/bin/ClassiCube
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I ran into the same situation when packaging clonehero: https://github.com/MetaDark/nixpkgs/blob/589715d52395ebb2c2c7813733649bb37b593f14/pkgs/games/clonehero/default.nix#L92-L93.

I discovered that you can fake argv[0] so that the binary thinks it was launched from another location. That way you don't need to copy the binary.

I would also recommend following the XDG Base Directory Specification rather storing files directly in the user's home directory: https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, actually looking into the source code it looks like it reads the path from /proc/self/exe rather than argv[0]. I tested it with a sample script and the exec -a workaround doesn't seem to work.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now I found the function that indicate the function that find the binary name, I can just patch it (I suppose)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please patch it? This is a not very great workaround.

@lheckemann lheckemann added this to the 20.03 milestone Sep 12, 2019
@marius851000
Copy link
Contributor Author

I don't know how to change the function that return the binary path, but I've updated to the 1.0.7 version.

@marius851000 marius851000 changed the title classicube: init at 1.0.6 classicube: init at 1.0.7 Sep 13, 2019
@disassembler disassembler modified the milestones: 20.03, 20.09 Feb 5, 2020
@stale
Copy link

stale bot commented Aug 3, 2020

Hello, I'm a bot and I thank you in the name of the community for your contributions.

Nixpkgs is a busy repository, and unfortunately sometimes PRs get left behind for too long. Nevertheless, we'd like to help committers reach the PRs that are still important. This PR has had no activity for 180 days, and so I marked it as stale, but you can rest assured it will never be closed by a non-human.

If this is still important to you and you'd like to remove the stale label, we ask that you leave a comment. Your comment can be as simple as "still important to me". But there's a bit more you can do:

If you received an approval by an unprivileged maintainer and you are just waiting for a merge, you can @ mention someone with merge permissions and ask them to help. You might be able to find someone relevant by using Git blame on the relevant files, or via GitHub's web interface. You can see if someone's a member of the nixpkgs-committers team, by hovering with the mouse over their username on the web interface, or by searching them directly on the list.

If your PR wasn't reviewed at all, it might help to find someone who's perhaps a user of the package or module you are changing, or alternatively, ask once more for a review by the maintainer of the package/module this is about. If you don't know any, you can use Git blame on the relevant files, or GitHub's web interface to find someone who touched the relevant files in the past.

If your PR has had reviews and nevertheless got stale, make sure you've responded to all of the reviewer's requests / questions. Usually when PR authors show responsibility and dedication, reviewers (privileged or not) show dedication as well. If you've pushed a change, it's possible the reviewer wasn't notified about your push via email, so you can always officially request them for a review, or just @ mention them and say you've addressed their comments.

Lastly, you can always ask for help at our Discourse Forum, or more specifically, at this thread or at #nixos' IRC channel.

@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Aug 3, 2020
Comment on lines +16 to +18
postUnpack = ''
sourceRoot=$sourceRoot/src
'';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
postUnpack = ''
sourceRoot=$sourceRoot/src
'';
sourceRoot="$sourceRoot/src";

@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Nov 29, 2020
Comment on lines +26 to +29
font = "${liberation-sans-narrow}/share/fonts/truetype/LiberationSansNarrow-Regular.ttf";

postPatch = ''
substituteInPlace Platform.c --replace %fontdir% ${font}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
font = "${liberation-sans-narrow}/share/fonts/truetype/LiberationSansNarrow-Regular.ttf";
postPatch = ''
substituteInPlace Platform.c --replace %fontdir% ${font}
postPatch = ''
substituteInPlace Platform.c --replace %fontdir% ${liberation-sans-narrow}/share/fonts/truetype/LiberationSansNarrow-Regular.ttf

Comment on lines +30 to +31
substituteInPlace Makefile --replace JOBS=1 JOBS=${ if enableParallelBuilding then "$NIX_BUILD_CORES" else "1"}
'';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you make this conditional on enableParallelBuilding and replace JOBS with NIX_BUILD_CORES? Also NIX_BUILD_CORES should always be 1 or more I think.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No really sure about what you mean. Do you mean using --replace JOBS "" --replace JOBS NIX_BUILD_CORES ?

rm -f ~/.ClassiCube/ClassiCubeBin
cp $out/bin/.ClassiCube ~/.ClassiCube/ClassiCubeBin
~/.ClassiCube/ClassiCubeBin
rm -f ~/.ClassiCube/ClassiCubeBin" > $out/bin/ClassiCube
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please patch it? This is a not very great workaround.

@marius851000
Copy link
Contributor Author

This took me far too much time compared to what I play of it. I'll close this PR. Anyone is free to continue this if they want (the main problem is patching the save directory). The code that seem to be used to save stuff are in the Platform.c file. They seem to use standard glibc function.

@360ied 360ied mentioned this pull request Sep 7, 2022
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants