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

vvvvvv: init at 2.3-git-2a514b2 #78319

Closed
wants to merge 464 commits into from
Closed

vvvvvv: init at 2.3-git-2a514b2 #78319

wants to merge 464 commits into from

Conversation

@anna328p
Copy link
Member

@anna328p anna328p commented Jan 22, 2020

Adds a package for VVVVVV, a platform game based on inverting gravity.

Motivation for this change

Adds the game VVVVVV to nixpkgs.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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.
@thefloweringash
Copy link
Member

@thefloweringash thefloweringash commented Jan 22, 2020

See also #77519

pkgs/games/vvvvvv/default.nix Outdated Show resolved Hide resolved
pkgs/games/vvvvvv/default.nix Outdated Show resolved Hide resolved
pkgs/games/vvvvvv/default.nix Outdated Show resolved Hide resolved
pkgs/games/vvvvvv/default.nix Outdated Show resolved Hide resolved
@anna328p anna328p requested a review from peterhoeg Jan 23, 2020
@nh2
nh2 approved these changes Jan 24, 2020
Copy link
Contributor

@nh2 nh2 left a comment

I tried it on NixOS, game works great!

@leo60228
Copy link
Contributor

@leo60228 leo60228 commented Jan 24, 2020

Giving Make and Play a different license from the full version is pretty clearly incorrect. Maybe the binaries should be in a derivation with a new license, and the wrappers for both should be unfree? We could probably get an exception for the Make and Play data.zip by asking the developer.

Oh, this was already covered in a review comment...

@jakobrs
Copy link
Contributor

@jakobrs jakobrs commented Jan 26, 2020

You probably need pkgs.darwin.apple_sdk.frameworks.Foundation for this to work on macOS. There will also (probably) be hard-coded paths to the macOS SDK in the resulting executable.

@jakobrs
Copy link
Contributor

@jakobrs jakobrs commented Jan 26, 2020

Also, do we really want to put data.zip in $out/bin?

@leo60228
Copy link
Contributor

@leo60228 leo60228 commented Jan 26, 2020

data.zip is searched for next to argv[0]. I have a patch at v6cord/VVVVVV-CE@8300615 to search in the cwd, it could probably be modified pretty easily to search in a path specified at compile-time.

@jakobrs
Copy link
Contributor

@jakobrs jakobrs commented Jan 26, 2020

Could one put data.zip somewhere in $out/share (or somewhere else) and have $out/bin/VVVVVV be a wrapper that calls the executable with a different argv[0]?

#! ${bash}/bin/bash

exec -a $out/share/.../VVVVVV .VVVVV-unwrapped

Something like that.

@leo60228
Copy link
Contributor

@leo60228 leo60228 commented Jan 26, 2020

Probably, yeah.

@leo60228
Copy link
Contributor

@leo60228 leo60228 commented Jan 26, 2020

Oh, looks like it uses /proc/self/exe and only falls back to argv[0].

@leo60228
Copy link
Contributor

@leo60228 leo60228 commented Jan 26, 2020

This can be worked around by mounting something else over proc after unshare -rm, but that's pretty hacky.

@anna328p
Copy link
Member Author

@anna328p anna328p commented Feb 2, 2020

uhh

I messed up my nixpkgs fork :/

@anna328p
Copy link
Member Author

@anna328p anna328p commented Feb 2, 2020

I am going to create a new PR with the correct branch this time

@anna328p anna328p mentioned this pull request Feb 2, 2020
3 of 10 tasks complete
@anna328p
Copy link
Member Author

@anna328p anna328p commented Feb 2, 2020

@anna328p anna328p closed this Feb 2, 2020
jakobrs added a commit to jakobrs/nixpkgs that referenced this pull request Feb 16, 2020
Adds a package for VVVVVV, a platform game based on inverting gravity.

Relevant:

- NixOS#77519
- NixOS#78319
- NixOS#79069
- TerryCavanagh/VVVVVV#139
- TerryCavanagh/VVVVVV#153
- TerryCavanagh/VVVVVV#155
- TerryCavanagh/VVVVVV#156

Co-authored-by: jakobrs <jakobrs100@gmail.com>
Co-authored-by: leo60228 <iakornfeld@gmail.com>
jakobrs added a commit to jakobrs/nixpkgs that referenced this pull request Feb 16, 2020
Adds a package for VVVVVV, a platform game based on inverting gravity.

Relevant:

- NixOS#77519
- NixOS#78319
- NixOS#79069
- TerryCavanagh/VVVVVV#139
- TerryCavanagh/VVVVVV#153
- TerryCavanagh/VVVVVV#155
- TerryCavanagh/VVVVVV#156

- git log at eb3527f

Co-authored-by: jakobrs <jakobrs100@gmail.com>
Co-authored-by: leo60228 <iakornfeld@gmail.com>
jakobrs added a commit to jakobrs/nixpkgs that referenced this pull request Feb 16, 2020
Adds a package for VVVVVV, a platform game based on inverting gravity.

Relevant:

- NixOS#77519
- NixOS#78319
- NixOS#79068
- TerryCavanagh/VVVVVV#139
- TerryCavanagh/VVVVVV#153
- TerryCavanagh/VVVVVV#155
- TerryCavanagh/VVVVVV#156

- git log at eb3527f

Co-authored-by: jakobrs <jakobrs100@gmail.com>
Co-authored-by: leo60228 <iakornfeld@gmail.com>
jakobrs added a commit to jakobrs/nixpkgs that referenced this pull request Feb 16, 2020
Adds a package for VVVVVV, a platform game based on inverting gravity.

Relevant:

- NixOS#77519
- NixOS#78319
- NixOS#79068
- TerryCavanagh/VVVVVV#139
- TerryCavanagh/VVVVVV#153
- TerryCavanagh/VVVVVV#155
- TerryCavanagh/VVVVVV#156

- git log at eb3527f

Co-authored-by: jakobrs <jakobrs100@gmail.com>
Co-authored-by: leo60228 <iakornfeld@gmail.com>
jakobrs added a commit to jakobrs/nixpkgs that referenced this pull request Mar 13, 2020
Adds a package for VVVVVV, a platform game based on inverting gravity.

Relevant:

- NixOS#77519
- NixOS#78319
- NixOS#79068
- TerryCavanagh/VVVVVV#139
- TerryCavanagh/VVVVVV#153
- TerryCavanagh/VVVVVV#155
- TerryCavanagh/VVVVVV#156

- git log at eb3527f

Co-authored-by: jakobrs <jakobrs100@gmail.com>
Co-authored-by: leo60228 <iakornfeld@gmail.com>
jakobrs added a commit to jakobrs/nixpkgs that referenced this pull request Mar 13, 2020
Adds a package for VVVVVV, a platform game based on inverting gravity.

Relevant:

- NixOS#77519
- NixOS#78319
- NixOS#79068
- TerryCavanagh/VVVVVV#139
- TerryCavanagh/VVVVVV#153
- TerryCavanagh/VVVVVV#155
- TerryCavanagh/VVVVVV#156

- git log at eb3527f

Co-authored-by: jakobrs <jakobrs100@gmail.com>
Co-authored-by: leo60228 <iakornfeld@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.