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.

Sign up for GitHub

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

Jump to bottom

Fix TZDIR paths in FHS environments #34961

Merged
merged 2 commits into from Mar 10, 2018
Merged

Fix TZDIR paths in FHS environments #34961

merged 2 commits into from Mar 10, 2018

Conversation

abbradar
Copy link
Member

Motivation for this change

Move Steam fix to a more general place and clean up.

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.

@the-kenny @yegortimoshenko You seem to have games which may be affected by those changes -- can you test that they still work?

@abbradar
buildFHSEnv: export TZDIR
a39d3d6 
This is needed since NixOS keeps tzdata in non-standard /etc/zoneinfo path.
@abbradar
steam: don't add zoneinfo manually
e5f6a0a 
We already have this done for FHS environments in general.
@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Partial log (click to expand)

Package ‘steam-original-1.0.0.51’ in /var/lib/gc-of-borg/nix-test-rs-3/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-3/pkgs/games/steam/steam.nix:31 has an unfree license (‘unfreeRedistributable’), refusing to evaluate.

a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Partial log (click to expand)

Package ‘steam-original-1.0.0.51’ in /home/borg/borg-rs/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/7c6f434c-buildbox/pkgs/games/steam/steam.nix:31 has an unfree license (‘unfreeRedistributable’), refusing to evaluate.

a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.

@lukateras
Copy link
Member

lukateras commented Feb 14, 2018 •
edited

The potentially affected games are various games that use Mono: Stardew Valley and Press X to Not Die. I'll test the change. Probably still doesn't work if time.timeZone is not set (see #31393).

@abbradar
Copy link
Member Author

Yeah, that shouldn't be fixed (I don't think we can handle #31393 in any way actually).

@abbradar
Copy link
Member Author

abbradar commented Mar 5, 2018

@yegortimoshenko Any luck with testing?

@abbradar
Copy link
Member Author

Tested with some Mono games; seems to work.

@abbradar abbradar merged commit 8332b7a into NixOS:master Mar 10, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
0.kind: enhancement 6.topic: steam 10.rebuild-darwin: 0 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@abbradar @GrahamcOfBorg @lukateras