Skip to content

imlib2: add explicit svg & heif support-disabling (fixing darwin build)#171947

Merged
vcunat merged 1 commit intoNixOS:staging-nextfrom
risicle:ris-imlib2-darwin-svg
May 8, 2022
Merged

imlib2: add explicit svg & heif support-disabling (fixing darwin build)#171947
vcunat merged 1 commit intoNixOS:staging-nextfrom
risicle:ris-imlib2-darwin-svg

Conversation

@risicle
Copy link
Contributor

@risicle risicle commented May 7, 2022 •
edited
Loading

Description of changes

...instead of just buildInput omission. Darwin still fails to build with svg support, but librsvg being accidentally included in one of the existing dependencies will cause support to be enabled. Oops.

See #166452 (comment)

cc @vcunat

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.05 Release Notes (or backporting 21.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label May 7, 2022
@ofborg ofborg bot requested a review from spwhitt May 7, 2022 12:24
@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels May 7, 2022
@risicle risicle force-pushed the ris-imlib2-darwin-svg branch from dd969ae to 0281a23 Compare May 7, 2022 12:35
@risicle risicle changed the base branch from staging to staging-next May 7, 2022 12:35
@risicle
Copy link
Contributor Author

risicle commented May 7, 2022

Hmm... this does not seem to do the trick.

@risicle
Copy link
Contributor Author

risicle commented May 7, 2022

Ah.. HEIF support also causing the problem.

@risicle
imlib2: add explicit svg & heif support-disabling
5b42ce1 
instead of just buildInput omission. darwin still fails to build with
svg or heif support, but a change in one of the present dependencies
may cause one of these libraries to be detected and the support
accidentally enabled.
@risicle risicle force-pushed the ris-imlib2-darwin-svg branch from 0281a23 to 5b42ce1 Compare May 7, 2022 13:05
@risicle risicle mentioned this pull request May 7, 2022
Merged
13 tasks
@risicle risicle marked this pull request as ready for review May 7, 2022 13:09
@risicle
Copy link
Contributor Author

risicle commented May 7, 2022

@ofborg build imlib2

@ofborg ofborg bot added 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. and removed 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels May 7, 2022
@risicle risicle changed the title imlib2: add explicit svg-support-disabling (fixing darwin build) imlib2: add explicit svg & heif support-disabling (fixing darwin build) May 7, 2022
@vcunat vcunat merged commit a865c7b into NixOS:staging-next May 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@spwhitt spwhitt Awaiting requested review from spwhitt

Assignees

No one assigned

Labels

6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@risicle @vcunat