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

descent 1 & 2: use assets from gog.com with the dxx-rebirth project #34611

Merged
merged 3 commits into from Feb 12, 2018

Conversation

peterhoeg
Copy link
Member

Motivation for this change

This contains a few items:

  1. Package the Perl "File-Rename" utility for downcasing all the file names
  2. A hook for GOG games that unpacks and downcases
  3. A set of asset derivations
  4. Launchers

A couple of questions:

a. Should the "downcase the file names" logic be separated out into its own build-support tool?
b. Any better suggestions than adding "-full" for the combined assets/binary derivation?

Cc: @viric

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Copy link
Member

@Ericson2314 Ericson2314 left a comment

Choose a reason for hiding this comment

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

I got requested just cause there's a new build hook, but it all looks good to me.

@@ -92,6 +92,10 @@ with pkgs;
{ substitutions = { gnu_config = gnu-config;}; }
../build-support/setup-hooks/update-autotools-gnu-config-scripts.sh;

gogUnpackHook = makeSetupHook
Copy link
Member

Choose a reason for hiding this comment

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

This takes a name parameter now, generally a friendly idea to use it.

@peterhoeg peterhoeg force-pushed the p/descent branch 3 times, most recently from 92294da to a7c983d Compare February 12, 2018 04:17
description = "Perl extension for renaming multiple files";
homepage = http://search.cpan.org/~rmbarker;
license = licenses.artistic1;
maintainer = with maintainers; [ peterhoeg ];
Copy link
Member

Choose a reason for hiding this comment

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

maintainer isn't a valid meta field, I'm working on a fixup push. This also exposed a bug in ofborg (NixOS/ofborg#73).

Copy link
Member Author

Choose a reason for hiding this comment

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

Arrghh, yes, it's maintainers. Which nix-build doesn't notice. Any thoughts on how to catch that locally?

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks for fixing master!

Copy link
Member

Choose a reason for hiding this comment

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

You might be able to put { checkMeta = true; } in your Nixpkgs configuration to catch it, otherwise I'm wanting to be able to let people run all the ofborg meta checks locally. That is a bit of a ways out though. In the mean time, I'd recommend just letting ofborg evaluate the PR before merging :) (if there is an ofborg problem, please ping me)

@peterhoeg peterhoeg restored the p/descent branch February 12, 2018 15:52
@peterhoeg peterhoeg deleted the p/descent branch February 13, 2018 03:21
@peterhoeg peterhoeg restored the p/descent branch February 13, 2018 11:25
@peterhoeg peterhoeg deleted the p/descent branch March 5, 2018 07:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants