Skip to content

krita: fix build with libjxl >= 0.9.0 #287532

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.

Sign up for GitHub

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

Jump to bottom
Merged
vcunat merged 1 commit into from
Feb 9, 2024
Merged

krita: fix build with libjxl >= 0.9.0 #287532

vcunat merged 1 commit into from
Feb 9, 2024

Conversation

@sifmelcara
Copy link
Member

@sifmelcara sifmelcara commented Feb 9, 2024 •
edited
Loading

Description of changes

Cherry-pick https://invent.kde.org/graphics/krita/-/commit/ace7edcca6ad322581ab39620f21ccf3ffbd3b5a , confirmed it fixes the build and basic functionality works

Addresses #282472 (comment)

  • 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.

@sifmelcara sifmelcara requested a review from vcunat February 9, 2024 17:32
@sifmelcara sifmelcara mentioned this pull request Feb 9, 2024
Merged
13 tasks
@ofborg ofborg bot requested review from abbradar and nek0 February 9, 2024 18:16
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Feb 9, 2024
@pbsds pbsds added the 8.has: upstream changes reviewed Reviewer checked the changelogs/commit logs associated with the release and did not find any issues. label Feb 9, 2024
@pbsds pbsds self-assigned this Feb 9, 2024
@vcunat vcunat merged commit 4dbe7f8 into NixOS:staging-next Feb 9, 2024
@vcunat
Copy link
Member

vcunat commented Feb 9, 2024

Oh. This seemed straightforward to me, simple upstream patch fixing the build.

Thanks.

@pbsds
Copy link
Member

pbsds commented Feb 9, 2024 •
edited
Loading

I started a nom build github:nixos/nixpkgs/refs/pull/287532/merge#krita, but i assume it may take hours. 👍

@vcunat
Copy link
Member

vcunat commented Feb 9, 2024

I did verify the build on x86_64 NixOS.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vcunat vcunat Awaiting requested review from vcunat

@abbradar abbradar Awaiting requested review from abbradar

@nek0 nek0 Awaiting requested review from nek0

Assignees

@pbsds pbsds

Labels

8.has: upstream changes reviewed Reviewer checked the changelogs/commit logs associated with the release and did not find any issues. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@sifmelcara @vcunat @pbsds