diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2ef6bdebe86..4702a2ad063 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14,6 +14,11 @@ with pkgs.lib; +let + qt5 = pkgs.qt514; + libsForQt5 = pkgs.libsForQt514; +in + let packages = ( self: @@ -3576,7 +3581,7 @@ in { maya = callPackage ../development/python-modules/maya { }; - mayavi = pkgs.libsForQt5.callPackage ../development/python-modules/mayavi { + mayavi = libsForQt5.callPackage ../development/python-modules/mayavi { inherit buildPythonPackage isPy27 fetchPypi; inherit (self) pyface pygments numpy vtk traitsui envisage apptools pyqt5; }; @@ -4162,7 +4167,7 @@ in { ovh = callPackage ../development/python-modules/ovh { }; - ovito = toPythonModule (pkgs.libsForQt5.callPackage ../development/python-modules/ovito { pythonPackages = self; }); + ovito = toPythonModule (libsForQt5.callPackage ../development/python-modules/ovito { pythonPackages = self; }); owslib = callPackage ../development/python-modules/owslib { }; @@ -4483,8 +4488,8 @@ in { pooch = callPackage ../development/python-modules/pooch { }; poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 { - inherit (pkgs.qt5) qtbase; - inherit (pkgs.libsForQt5) poppler; + inherit (qt5) qtbase; + inherit (libsForQt5) poppler; inherit (pkgs) pkgconfig; }; @@ -5187,7 +5192,7 @@ in { pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { inherit (pkgs) pkgconfig; }; - pyqt5 = pkgs.libsForQt514.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; }; + pyqt5 = libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; }; pyqt5_with_qtmultimedia = self.pyqt5.override { withMultimedia = true; }; @@ -5200,7 +5205,7 @@ in { pyqtgraph = callPackage ../development/python-modules/pyqtgraph { }; - pyqtwebengine = pkgs.libsForQt514.callPackage ../development/python-modules/pyqtwebengine { pythonPackages = self; }; + pyqtwebengine = libsForQt5.callPackage ../development/python-modules/pyqtwebengine { pythonPackages = self; }; pyquery = callPackage ../development/python-modules/pyquery { }; @@ -5901,7 +5906,7 @@ in { qscintilla-qt4 = callPackage ../development/python-modules/qscintilla { }; - qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { pythonPackages = self; }; + qscintilla-qt5 = libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { pythonPackages = self; }; qscintilla = self.qscintilla-qt4;