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
pythonPackages.sip: do not build tools for non-default sip module #52968
Conversation
configureFlags = ( | ||
if (!withModule) then [ "--no-module" ] else [ | ||
"--sip-module" sipModule | ||
"-d" "${placeholder "out"}/lib/${python.libPrefix}/site-packages" |
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.
python.sitePackages
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.
fixed
This ensures that the default sip and alternative sips do not have common files.
@@ -32,9 +32,9 @@ in buildPythonPackage { | |||
|
|||
outputs = [ "out" "dev" ]; | |||
|
|||
nativeBuildInputs = [ pkgconfig qmake lndir ]; | |||
nativeBuildInputs = [ pkgconfig qmake lndir sip ]; |
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.
Should this be pyqt5-sip?
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.
No, it seems that the upstream envisions that there is one tool sip
which generates multiple modules according to sip -n module_name
parameter. This is why sip
-the-tool is a native build input, and pyqt5-sip
-module is a propagated build input.
After this PR sip
ships both the tool and the module sip
(as before), but pyqt5-sip
ships only the module PyQt5.sip
.
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.
Ok. Could you include the explanation as a comment?
Are there any updates on this pull request, please? |
I should have seen this when working on the |
Thank you for your contributions.
|
Would this change be relevant if sip will be upgraded? #99936 |
rebased in #100050. |
Motivation for this change
This ensures that the default sip and alternative sips do not have any files in common: #52956 (comment)
Things done
sandbox
innix.conf
on non-NixOS)nix-shell -p nox --run "nox-review wip"
./result/bin/
)nix path-info -S
before and after)