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

qt6.full: unlink qmake6 #239973

Merged
merged 1 commit into from
Jun 26, 2023
Merged

qt6.full: unlink qmake6 #239973

merged 1 commit into from
Jun 26, 2023

Conversation

wegank
Copy link
Member

@wegank wegank commented Jun 26, 2023

Description of changes

Closes #239971.

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.11 Release Notes (or backporting 23.05 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.

@Be-ing
Copy link

Be-ing commented Jun 26, 2023

Thanks for the quick fix!

@wegank wegank merged commit c68c55b into NixOS:master Jun 26, 2023
26 checks passed
@wegank wegank deleted the qt6-full-fix branch June 26, 2023 19:51
@vimpostor
Copy link
Contributor

vimpostor commented Mar 11, 2024

@wegank Was there a reason for applying this only to qt6.full?
The original downstream project that failed to build before this patch, now builds with qt6.full, but fails to build with the very same old issue when building with qt6.qtbase + qt6.qtdeclarative.

Shouldn't we apply this postBuild step for qt6.qtbase as well?

@wegank
Copy link
Member Author

wegank commented Mar 11, 2024

The point is that qmake6 doesn't work when called via symlink, which basically results in the following:

  • Before this PR, ${qt6.full}/bin/qmake6 is a symlink to ${qt6.qtbase}/bin/qmake6: not OK.
  • After this PR, ${qt6.full}/bin/qmake6 is a real file: OK.
  • For your question, ${qt6.qtbase}/bin/qmake6 is a real file: OK. There's nothing to fix.

However, if you combine qt6.qtbase and qt6.qtdeclarative, you have to do the check yourself.

@vimpostor
Copy link
Contributor

Thanks for clearing that up, makes sense. Although it is a bit cumbersome, that you then no longer can do a simple nix-shell -p qt6.qtbase qt6.qtdeclarative and have everything working.

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.

qmake6 gives incorrect values with qt6.full
3 participants