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

Revert "desktopToDarwinBundle: use imagemagick_light" #282764

Merged
merged 1 commit into from
Jan 23, 2024

Conversation

reckenrode
Copy link
Contributor

@reckenrode reckenrode commented Jan 22, 2024

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

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 reputable person label Jan 22, 2024
@vcunat vcunat merged commit 4b679cb into NixOS:staging-next Jan 23, 2024
25 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants