diff options
author | Orivej Desh <orivej@gmx.fr> | 2018-12-27 03:06:14 +0000 |
---|---|---|
committer | Orivej Desh <orivej@gmx.fr> | 2018-12-27 11:17:22 +0000 |
commit | 4ec84c297cb0adfadcc8290a2395031581e8d640 (patch) | |
tree | 25a9521d9ff13b7778a3f3f960639669f775b2cc /pkgs/development | |
parent | bf1a563af0aab7e3057eb7f0f20b6c26ce0ee7cc (diff) | |
download | nixlib-4ec84c297cb0adfadcc8290a2395031581e8d640.tar nixlib-4ec84c297cb0adfadcc8290a2395031581e8d640.tar.gz nixlib-4ec84c297cb0adfadcc8290a2395031581e8d640.tar.bz2 nixlib-4ec84c297cb0adfadcc8290a2395031581e8d640.tar.lz nixlib-4ec84c297cb0adfadcc8290a2395031581e8d640.tar.xz nixlib-4ec84c297cb0adfadcc8290a2395031581e8d640.tar.zst nixlib-4ec84c297cb0adfadcc8290a2395031581e8d640.zip |
pythonPackages.pyqt5: import sip as PyQt5.sip
pyqt5 5.11 has switched from sip to PyQt5.sip.
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/python-modules/pyqt/5.x.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 7c08b9f45d1c..14d7bddbb709 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -8,7 +8,9 @@ let pname = "PyQt"; version = "5.11.3"; - inherit (pythonPackages) buildPythonPackage python isPy3k dbus-python sip enum34; + inherit (pythonPackages) buildPythonPackage python isPy3k dbus-python enum34; + + sip = pythonPackages.sip.override { sip-module = "PyQt5.sip"; }; in buildPythonPackage { pname = pname; @@ -32,10 +34,10 @@ in buildPythonPackage { nativeBuildInputs = [ pkgconfig qmake lndir ]; - buildInputs = [ dbus ]; + buildInputs = [ dbus sip ]; propagatedBuildInputs = [ - sip qtbase qtsvg qtwebkit qtwebengine + qtbase qtsvg qtwebkit qtwebengine ] ++ lib.optional (!isPy3k) enum34 ++ lib.optional withWebSockets qtwebsockets ++ lib.optional withConnectivity qtconnectivity; configurePhase = '' @@ -65,7 +67,7 @@ in buildPythonPackage { ''; postInstall = '' - ln -s ${sip}/${python.sitePackages}/PyQt5/* $out/${python.sitePackages}/PyQt5 + ln -s ${sip}/${python.sitePackages}/PyQt5/sip.* $out/${python.sitePackages}/PyQt5/ for i in $out/bin/*; do wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH" done |