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
libsForQt5.qtfeedback: init at unstable-2018-09-03 #121934
Conversation
Result of 3 packages built successfully:
|
I guess that's up to @NixOS/qt-kde to decide. |
]; | ||
|
||
preConfigure = '' | ||
perl ${qtbase.dev}/bin/syncqt.pl -version ${lib.getVersion qtbase} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Qmake can run this automatically if you leaveDotGit = true
in src
(I think) or manually set CONFIG+=git_build
in qmakeFlags
, but it's currently broken (#76080). #118904 is supposed to fix that.
The -version
value is then taken from the .qmake.conf
file in the root of src
, which is MODULE_VERSION = 0.0.0
. I don't think this version reflects the Qt version it was built against, but the module's version for API compatibility? Debian patches this to 5.0.0
, Alpine leaves it as 0.0.0
. 🤷♂️
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
leaveDotGit
causes the FODs to be really less reproducible.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You're right, it was meant as more of a "this is the Qt-intended way of setting it". Should've focused more on what I was writing. 😓
.git
presence sets git_build
CONFIG value: https://github.com/qt/qtbase/blob/9db7cc79a26ced4997277b5c206ca15949133240/mkspecs/features/qt_build_paths.prf#L21-L22
If git_build
is set, the syncqt
will be prepared to automatically generate headers: https://github.com/qt/qtbase/blob/9db7cc79a26ced4997277b5c206ca15949133240/mkspecs/features/qt_module_headers.prf#L14-L15
qmakeFlags = [ "CONFIG+=git_build" ];
works better for us because that doesn't need leaveDotGit = true
. I've tested this PR on top of #118904, modified to set git_build
instead of calling syncqt manually, and it compiled fine. I think we should go that way instead when #118904 finds its way into master.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
qmakeFlags = [ "CONFIG+=git_build" ];
works better for us because that doesn't needleaveDotGit = true
. I've tested this PR on top of #118904, modified to setgit_build
instead of calling syncqt manually, and it compiled fine. I think we should go that way instead when #118904 finds its way into master.
I had tried is with git init
in postPatch
and that also worked on top of #118904, but your approach is better. I've rebased the PR on staging.
I think it should remain separate until it's officially part of Qt. |
5e62712
to
fb48af7
Compare
This is still bothering me. |
1b57f6b
to
3d2385b
Compare
3d2385b
to
b7701cf
Compare
Co-authored-by: OPNA2608 <christoph.neidahl@gmail.com>
b7701cf
to
8c9069d
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Diff LGTM.
Motivation for this change
useful for #121345
Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)I got the
preConfigure
line from https://github.com/OpenMandrivaAssociation/qt5-qtfeedback/blob/master/qt5-qtfeedback.spec and thepostFixup
one from https://git.alpinelinux.org/aports/tree/community/qt5-qtfeedback/APKBUILD.The licenses are really confusing, but what I put is conforming to the header of e.g. https://github.com/qt/qtfeedback/blob/a14bd0bb1373cde86e09e3619fb9dc70f34c71f2/src/feedback/qfeedbackglobal.h.
I have no idea how to make the tests actually do something.
cc @NixOS/qt-kde