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

stdenv: correctly make stdenv.system refer to the host platform #92961

Merged
merged 1 commit into from
Jul 11, 2020

Conversation

lopsided98
Copy link
Contributor

Motivation for this change

#46148 was supposed to make this change, but it did not due to an accidental use of buildPlatform instead of hostPlatform. This change should only affect cross-compilation, causing no rebuilds in the native case.

See #46148 (comment) for more discussion.

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.

cc @Ericson2314

Sorry, something went wrong.

This was supposed to be done in 773233c, but was not due to a small
mistake.
@Ericson2314 Ericson2314 merged commit fdbcba8 into NixOS:master Jul 11, 2020
@Ericson2314
Copy link
Member

Thanks!

@lopsided98 lopsided98 deleted the stdenv-system-fix branch July 11, 2020 20:20
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

2 participants