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

libjxl: fix cross compilation by only conditionally enabling plugins #306127

Merged
merged 1 commit into from
Apr 28, 2024

Conversation

uninsane
Copy link
Contributor

plugins were enabled in #299988 and this essentially makes the changes of that PR apply only to native builds. this is required because cross builds of gdk-pixbuf do not provide gdk-pixbuf-thumbnailer, and hence libjxl's gdk-pixbuf-thumbnailer-jxl fails to wrap.

Description of changes

fixes build of pkgsCross.aarch64-multiplatform.libjxl

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 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.

Add a 👍 reaction to pull requests you find important.

`gdk-pixbuf` does not always provide `gdk-pixbuf-thumbnailer`,
particularly when cross compiling. without gdk-pixbuf-thumbnailer,
gdk-pixbuf-thumbnailer-jxl fails to wrap.
@uninsane uninsane added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Apr 22, 2024
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Apr 23, 2024
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.

This may break some things, but better than nothing for now, I think

@Mindavi Mindavi merged commit f69fa27 into NixOS:master Apr 28, 2024
26 checks passed
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: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants