Skip to content

Revert "desktopToDarwinBundle: use imagemagick_light"#282764

Merged
vcunat merged 1 commit intoNixOS:staging-nextfrom
reckenrode:desktopToDarwinBundle-fix
Jan 23, 2024
Merged

Revert "desktopToDarwinBundle: use imagemagick_light"#282764
vcunat merged 1 commit intoNixOS:staging-nextfrom
reckenrode:desktopToDarwinBundle-fix

Conversation

@reckenrode
Copy link
Contributor

@reckenrode reckenrode commented Jan 22, 2024 •
edited
Loading

Changing desktopToDarwinBundle to use imagemagick_light is a breaking change. imagemagick_light does not support png, which causes any package with png icons to fail to build. In particular, this affects inkscape and gimp, which are Darwin channel blockers.

I am targeting staging-next #281828 because this change has not yet hit master. There are no builds yet on Hydra since this is a new cycle, and builds of affected packages have not started yet.

I discovered this change while testing #282624 to make sure Darwin channel blockers and packages with workarounds for #166205 reverted all built. I confirmed that mupdf-headless still builds with this commit reverted.

Description of changes

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.

@reckenrode
Copy link
Contributor Author

reckenrode commented Jan 22, 2024

This is the error I get when building Inkscape.

desktopToDarwinBundle: Application bundles do not understand desktop entry field codes. Changed 'inkscape %F' to 'inkscape'.
desktopToDarwinBundle: using fixed icon /nix/store/mx068xiynld3qdknqgzpi1yjcfaq8rvc-inkscape-1.3.2/share/icons/hicolor/16x16/apps/org.inkscape.Inkscape.png for size 16
convert: no decode delegate for this image format `PNG' @ error/constitute.c/ReadImage/746.
convert: no images defined `/private/tmp/nix-build-inkscape-1.3.2.drv-0/tmp.abR6tIyZhK/16x16.png' @ error/convert.c/ConvertImageCommand/3362.

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jan 22, 2024
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 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 Jan 22, 2024
@reckenrode reckenrode mentioned this pull request Jan 22, 2024
Closed
13 tasks
@vcunat vcunat merged commit 4b679cb into NixOS:staging-next Jan 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dotlambda dotlambda dotlambda approved these changes

Assignees

No one assigned

Labels

10.rebuild-darwin: 11-100 This PR causes between 11 and 100 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. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@reckenrode @dotlambda @delroth @vcunat