Skip to content

Comments

librsvg: fix cross#136231

Merged
alyssais merged 3 commits intoNixOS:stagingfrom
alyssais:librsvg
Sep 27, 2021
Merged

librsvg: fix cross#136231
alyssais merged 3 commits intoNixOS:stagingfrom
alyssais:librsvg

Conversation

@alyssais
Copy link
Member

Motivation for this change

gobject-introspection doesn't cross build at the moment, and doesn't
work well with cross even when it does, so this is far more likely to
keep working if we just disable it when cross compiling.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all packages 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/)
  • 21.11 Release Notes (or backporting 21.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@alyssais alyssais added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Aug 30, 2021
@ofborg ofborg bot requested review from amaxine, dasj19, hedning and jtojnar August 30, 2021 20:30
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. labels Aug 30, 2021
Comment on lines +36 to +38
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it makes sense to have it just before the build inputs, because it changes how they work (somewhat), so it's important to have seen that just before seeing the build inputs.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this is for gdk-pixbuf-query-loaders?

Copy link
Contributor

@Mindavi Mindavi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great to see someone working on this. I've had a patch in a local tree for some time, but I wasn't sure if it's a good idea to just not create the loader cache. I guess we'll see where this goes. At least it builds now, which is already better than nothing.

@alyssais alyssais requested a review from Mindavi September 19, 2021 21:57
Copy link
Contributor

@Mindavi Mindavi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, except for one comment I left.

Note that I'm building this currently, but I have some other packages in the queue so it might take a while.

Fixing the comment I described fixes the build, but otherwise it fails (because the cache file can't be found).

@ofborg ofborg bot requested a review from jtojnar September 20, 2021 04:44
gobject-introspection doesn't cross build at the moment, and doesn't
work well with cross even when it does, so this is far more likely to
keep working if we just disable it when cross compiling.
@alyssais alyssais merged commit ddd264f into NixOS:staging Sep 27, 2021
@jtojnar jtojnar mentioned this pull request Oct 22, 2021
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: cross-compilation Building packages on a different platform than they will be used on 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants