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: build gdk-pixbuf loader and thumbnailer #299988

Merged
merged 1 commit into from
Mar 31, 2024

Conversation

zzzsyyy
Copy link
Member

@zzzsyyy zzzsyyy commented Mar 29, 2024

Description of changes

Supersedes #269570

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.

@amaxine
Copy link
Contributor

amaxine commented Mar 29, 2024

I'm building on top of the gnome-46 branch together with 269563 to test this. Thanks!

pkgs/development/libraries/libjxl/default.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/libjxl/default.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/libjxl/default.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/libjxl/default.nix Outdated Show resolved Hide resolved
@zzzsyyy zzzsyyy force-pushed the libjxl_gdk-pixbuf branch from ef5d99f to 966d04c Compare March 29, 2024 15:03
@amaxine
Copy link
Contributor

amaxine commented Mar 29, 2024

Works for me.

@jtojnar I think I understand why there would be a preference for #153275 to land, but this seems not too dissimilar to the way we have libavif support, and is a blocker for 46 since about half the default wallpapers are jxl - clearly as a push for improving support. Could you give this a quick review of your own please, if you have the time?

, zlib
, asciidoc
, graphviz
, doxygen
, python3
}:

let
loadersPath = "${gdk-pixbuf.binaryDir}/jxl-loaders.cache";
Copy link
Member

Choose a reason for hiding this comment

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

Maybe also include the version number to make chance of conflict even lower but this looks good to me.

@amaxine
Copy link
Contributor

amaxine commented Mar 31, 2024

As ofborg is complaining (and having compared with the commit I built locally), lcms2 is missing here.

@zzzsyyy zzzsyyy force-pushed the libjxl_gdk-pixbuf branch from 966d04c to 319f05e Compare March 31, 2024 11:50
@amaxine amaxine merged commit 90d38cd into NixOS:staging Mar 31, 2024
22 of 23 checks passed
@zzzsyyy zzzsyyy deleted the libjxl_gdk-pixbuf branch June 3, 2024 11:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants