Skip to content

sip: modify module name only for use with PyQt5 #52946

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

Closed
veprbl wants to merge 1 commit into from
Closed

sip: modify module name only for use with PyQt5 #52946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkgs/development/python-modules/pyqt/5.x.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ let
pname = "PyQt";
version = "5.11.3";

inherit (pythonPackages) buildPythonPackage python isPy3k dbus-python sip enum34;
inherit (pythonPackages) buildPythonPackage python isPy3k dbus-python sip_forPyQt5 enum34;

in buildPythonPackage {
pname = pname;
Expand All @@ -35,7 +35,7 @@ in buildPythonPackage {
buildInputs = [ dbus ];

propagatedBuildInputs = [
sip qtbase qtsvg qtwebkit qtwebengine
sip_forPyQt5 qtbase qtsvg qtwebkit qtwebengine
] ++ lib.optional (!isPy3k) enum34 ++ lib.optional withWebSockets qtwebsockets ++ lib.optional withConnectivity qtconnectivity;

configurePhase = ''
Expand Down Expand Up @@ -65,7 +65,7 @@ in buildPythonPackage {
'';

postInstall = ''
ln -s ${sip}/${python.sitePackages}/PyQt5/* $out/${python.sitePackages}/PyQt5
ln -s ${sip_forPyQt5}/${python.sitePackages}/PyQt5/* $out/${python.sitePackages}/PyQt5
for i in $out/bin/*; do
wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH"
done
Expand Down
5 changes: 3 additions & 2 deletions pkgs/development/python-modules/sip/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{ lib, fetchurl, buildPythonPackage, python, isPyPy }:
{ lib, fetchurl, buildPythonPackage, python, isPyPy
, forPyQt5 ? false }:

buildPythonPackage rec {
pname = "sip";
Expand All @@ -14,7 +15,7 @@ buildPythonPackage rec {

configurePhase = ''
${python.executable} ./configure.py \
--sip-module PyQt5.sip \
${lib.optionalString forPyQt5 "--sip-module PyQt5.sip"} \
-d $out/lib/${python.libPrefix}/site-packages \
-b $out/bin -e $out/include
'';
Expand Down
1 change: 1 addition & 0 deletions pkgs/top-level/python-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,6 +716,7 @@ in {
singledispatch = callPackage ../development/python-modules/singledispatch { };

sip = callPackage ../development/python-modules/sip { };
sip_forPyQt5 = callPackage ../development/python-modules/sip { forPyQt5 = true; };

sortedcontainers = callPackage ../development/python-modules/sortedcontainers { };

Expand Down