-
-
Notifications
You must be signed in to change notification settings - Fork 15.1k
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
nix: Patch config.nix.in to reference host platform binaries #81317
Conversation
@GrahamcOfBorg eval |
6da46dc
to
e82f88c
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you also split the patching of config.nix.in and the cleanup into two separate commits, so we can only backport the fix into 20.03?
3d9e9db
to
7e762d8
Compare
@flokli I split into two commits and made sure no more tabs got in. Can you re-review? |
I built this, and Did you copy over the closure and see if nix behaves properly? |
I have not yet. Odd that the closure still pulls in native stuff. I'll try it tomorrow when I can get my pi back out |
7e762d8
to
3b72c55
Compare
Motivation for this change
Presently the stable version of nix (2.3.3), when cross-compiled from nixpkgs, will pull into its closure and attempt to invoke the build platform's version of bash. This works around some of the build system for nix to correct that, so that a cross-compiled nix binary can be used on the system it is compiled for.
See #81153
Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)