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

qt5.wrapQtAppsHook: fix interaction with strictDeps #213926

Merged
merged 1 commit into from
Feb 2, 2023

Conversation

NickCao
Copy link
Member

@NickCao NickCao commented Feb 1, 2023

Description of changes

See 71cbf3b and 1fb7211 for related works.

As wrapQtAppsHook is normally put inside nativeBuildInputs, it can be considered as a compiler, locating dependencies in its targetPlatform.

Issue found while reviewing #213911, where qtimageformats propagated from dtkwidget is not picked up by wrapQtAppsHook.

cc @NixOS/qt-kde

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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

Copy link
Member

@ttuegel ttuegel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good!

@ttuegel ttuegel merged commit ae2a076 into NixOS:staging Feb 2, 2023
@NickCao NickCao deleted the qt-wrap branch February 2, 2023 22:24
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.

2 participants