Fix NixOS cross-compilation SD Image#108173
Merged
flokli merged 1 commit intoNixOS:staging-nextfrom Jan 2, 2021
Merged
Conversation
gobject-introspection doesn't currently cross-compile (see NixOS#88222), but polkit is somewhat essential for many system components. By disabling gobject-introspection when cross-compiling, we get it to build.
flokli
added
the
6.topic: cross-compilation
ofborg
bot
added
10.rebuild-darwin: 0
9 tasks
lovesegfault
approved these changes
Jan 2, 2021
Atemu
approved these changes
Jan 2, 2021
Member
Atemu
left a comment
Atemu
left a comment
There was a problem hiding this comment.
Didn't test on armv7l but this is a trivial change and should remove the gobject-introspection dependency from the base image.
Probably doesn't even need to go to staging-next, this causes 0 rebuilds on non-cross platforms.
Member
Author
|
I assumed staging-next to get merged soon anyways, and only did test on that branch. IIRC, there was more in there necessary to build the full base image. |
Member
Hopefully in a day or two. Waiting for some aarch64 results. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #106759.
Motivation for this change
Build NixOS aarch64 sd image by just instantiating the profile, without any required manual hacks in the config.
Apparently, there was very few left to fix #106759 (for aarch64 at least).
polkitcan be built without gobject introspection.With this, I can just
nix-build -E 'let pkgs = (import ./.) {}; in (pkgs.pkgsCross.aarch64-multiplatform.nixos ./nixos/modules/installer/cd-dvd/sd-image-aarch64.nix).sdImage'… computer go brrr…
And tada, you get a aarch64 image :-)
No more need to manually disable polkit and udisks.
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)