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

stdenv cross adapter: Misc changes #29646

Merged
merged 3 commits into from Sep 21, 2017
Merged

stdenv cross adapter: Misc changes #29646

merged 3 commits into from Sep 21, 2017

Conversation

Ericson2314
Copy link
Member

@Ericson2314 Ericson2314 commented Sep 21, 2017 •
edited

Motivation for this change
  1. Update gnu-config on non-Linux Aarch64 too
  2. Throw out invalidated extra run-time deps.
  3. Add optional overrides parameter
Things done

Only cross compiled, non-Linux, Aarch64 packages have changed hashes---that's nothing that works today. All Nix expression interfaces are preserved, too.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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.

@Ericson2314
stdenv: Update autotools scripts on all Aarch64, not just Linux
738bb47 
This is needed when cross-compiling for iOS (Aarch64 + Darwin). I also
changed the syntax of the Linux stdenv for visual consistency, though
that has no effect on semantics as the os is already guaranteed to be
Linux.
@Ericson2314
stdenv cross adaptor: Add optional overrides parameter
05ef103 
By default, all previous overrides are discarded as before, as they
would only apply to the old host platform. But sometimes it is useful to
add some new ones, and this optional parameter allows that.
@Ericson2314
stdenv cross adapater: Remove old extraBuildInputs
3af3d6e 
They, unlike their native counterparts, run on the wrong platform and
are therefore invalid.
@Ericson2314 Ericson2314 added the 6.topic: cross-compilation Building packages on a different sort platform than than they will be run on label Sep 21, 2017
@Ericson2314 Ericson2314 merged commit fe2e7de into NixOS:master Sep 21, 2017
@Ericson2314 Ericson2314 deleted the stdenv-cross-adapter branch September 21, 2017 19:47
@Ericson2314 Ericson2314 restored the stdenv-cross-adapter branch September 21, 2017 19:48
@Ericson2314 Ericson2314 deleted the stdenv-cross-adapter branch September 21, 2017 19:48
@Ericson2314 Ericson2314 added this to Needed for binutils-wrapper in Cross compilation Sep 21, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dezgeg dezgeg Awaiting requested review from dezgeg

@edolstra edolstra Awaiting requested review from edolstra

Assignees
No one assigned
Labels
6.topic: cross-compilation Building packages on a different sort platform than than they will be run on
Projects
No open projects
Cross compilation
Needed for binutils-wrapper
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@Ericson2314