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

libtiff: propagate libdeflate and format expression (resumed) #222518

Merged
merged 4 commits into from Apr 16, 2023

Conversation

ShamrockLee
Copy link
Contributor

@ShamrockLee ShamrockLee commented Mar 22, 2023

Description of changes

Move libdeflate into propagatedBuildInputs after #216181

Remove libdeflate from the buildInputs of openjpeg, since the latter only directly depends on libtiff but not libdeflate.

Fixes #221918 (entangle build failure)

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/)
  • 23.05 Release Notes (or backporting 22.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.

libdeflate is a dependency of libtiff which pkg-config expects seeing,
and openjpeg doesn't use libdeflate directly (aside from libtiff) [1]

As it is now added to the propagatedBuildInputs of the
Remove from the buildInputs of reverse-dependent packages.

1: https://packages.debian.org/source/buster/openjpeg2
@ShamrockLee
Copy link
Contributor Author

libtiff.passthru.tests and openjpeg.passthru.tests passed locally on my x86_64 NixOS laptop.

@vcunat
Copy link
Member

vcunat commented Apr 16, 2023

This seems like some weird mess. The direct dependency is only needed for static linking (pkg-config --static) but our libtiff does not install any static libs (by default).

@vcunat
Copy link
Member

vcunat commented Apr 16, 2023

Though yes, the same applies to the other three libraries as well... anyway, the propagation shouldn't be expensive here.

@vcunat vcunat merged commit a551f1a into NixOS:staging Apr 16, 2023
13 checks passed
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.

None yet

3 participants