Skip to content

qt5.qtbase: prepare for structuredAttrs #472655

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.

Sign up for GitHub

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

Jump to bottom
Draft
SFrijters wants to merge 1 commit into
base: staging
Choose a base branch
from
Draft

qt5.qtbase: prepare for structuredAttrs #472655

SFrijters wants to merge 1 commit into from
+80 −43

Conversation

@SFrijters
Copy link
Member

@SFrijters SFrijters commented Dec 20, 2025 •
edited
Loading

This fixes the hook for downstream users when __structuredAttrs are enabled.

#237216

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

Add a 👍 reaction to pull requests you find important.

@SFrijters SFrijters marked this pull request as draft December 20, 2025 10:00
@SFrijters SFrijters mentioned this pull request Dec 20, 2025
Open
4 tasks
@SFrijters SFrijters force-pushed the qt5-base-replacevars-structuredattrs branch from a442e27 to 523f168 Compare December 20, 2025 10:06
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. labels Dec 20, 2025
@SFrijters SFrijters force-pushed the qt5-base-replacevars-structuredattrs branch from 523f168 to ef2cbcd Compare December 22, 2025 23:55
@SFrijters SFrijters changed the title qt5.qtbase: use replaceVars for setup hook qt5.qtbase: prepare for structuredAttrs Dec 22, 2025
SFrijters
SFrijters commented Dec 22, 2025
View reviewed changes
pkgs/development/libraries/qt-5/modules/qtbase.nix
'';

env = {
inherit qtPluginPrefix qtQmlPrefix;
Copy link
Member Author

@SFrijters SFrijters Dec 22, 2025

Choose a reason for hiding this comment

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

I'm actually not sure anymore if we still need this (I hope not), but I'm in the middle of another rebuild now so I can't check.

@SFrijters SFrijters marked this pull request as ready for review December 22, 2025 23:57
@SFrijters SFrijters force-pushed the qt5-base-replacevars-structuredattrs branch from ef2cbcd to cfe665d Compare December 23, 2025 00:01
@SFrijters SFrijters marked this pull request as draft December 23, 2025 00:01
@SFrijters
Copy link
Member Author

SFrijters commented Dec 23, 2025

Ugh, back to draft, for some variants I'm getting Project ERROR: /build/qtbase-bebdfd5/examples/qpa/windows/windows.pro installs target to unexpected location and related errors.

@SFrijters SFrijters force-pushed the qt5-base-replacevars-structuredattrs branch 6 times, most recently from a740ac3 to 9c64598 Compare December 24, 2025 23:45
@SFrijters
qt5.qtbase: prepare for structuredAttrs
ce7b405 
Use replaceVars / makeSetupHook instead of (implicit) substituteAll
This fixes the hook for downstream users when __structuredAttrs are enabled.

Also clean configureFlags w.r.t. whitespace inside flags.
@SFrijters SFrijters force-pushed the qt5-base-replacevars-structuredattrs branch from 9c64598 to ce7b405 Compare December 25, 2025 01:05
@SFrijters
Copy link
Member Author

SFrijters commented Dec 25, 2025

lib.optional considered harmful... wasted a lot of time trying to get substitutions fixed, but the last error was actually lib.optional instead of lib.optionals invalidating configureFlags :(

@SFrijters SFrijters marked this pull request as ready for review December 25, 2025 01:12
@nixpkgs-ci nixpkgs-ci bot requested a review from ttuegel December 25, 2025 01:13
@SFrijters
Copy link
Member Author

SFrijters commented Dec 25, 2025 •
edited
Loading

New problem: build of qca fails because /nix/store/v6z6z60r94fmrg0gli90fc4frkgvg5p4-qtbase-5.15.18-dev/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake refers to /nix/store/gilra199wlk01wlr09iss4mpcn63ra52-qtbase-5.15.18-bin/bin/qmake but it should refer to the dev output instead: /nix/store/v6z6z60r94fmrg0gli90fc4frkgvg5p4-qtbase-5.15.18-dev/bin/qmake exists.

@K900 K900 marked this pull request as draft December 25, 2025 07:24
@SFrijters
Copy link
Member Author

SFrijters commented Dec 27, 2025

I have fixed the problem locally in a hacky way by rewriting the paths in fixup, I just have to do it properly before I re-open this for review.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bkchr bkchr Awaiting requested review from bkchr

@K900 K900 Awaiting requested review from K900

@NickCao NickCao Awaiting requested review from NickCao

@OPNA2608 OPNA2608 Awaiting requested review from OPNA2608

@qknight qknight Awaiting requested review from qknight

@SuperSandro2000 SuperSandro2000 Awaiting requested review from SuperSandro2000

@ttuegel ttuegel Awaiting requested review from ttuegel

Assignees

No one assigned

Labels

10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin 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. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@SFrijters