diff options
| author | Vincent Laporte <vbgl@users.noreply.github.com> | 2019-09-12 15:31:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-12 15:31:17 +0000 |
| commit | bf759337fa315416fc8304c256243b824954e86f (patch) | |
| tree | 659c1dfa61d8948294e222e0b59de7fccef8bd0c /pkgs/top-level | |
| parent | 6ea6c9d9f2e1721e4f5d801da0cc1556d9a449d7 (diff) | |
| parent | ef15478313dccf73684d46816d20752ba5b18cf4 (diff) | |
Merge pull request #67544 from vbgl/qarte+fix-qt-platform
qarte: use qt5’s mkDerivation and an other fix
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a992f7a0f788e..280041646b4f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5687,7 +5687,7 @@ in openmodelica = callPackage ../applications/science/misc/openmodelica { }; - qarte = callPackage ../applications/video/qarte { }; + qarte = libsForQt5.callPackage ../applications/video/qarte { }; qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f3c687b820a5c..96885a83ebb47 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1002,6 +1002,8 @@ in { */ pyqt5_with_qtwebkit = self.pyqt5.override { withWebKit = true; }; + pyqt5_with_qtmultimedia = self.pyqt5.override { withMultimedia = true; }; + pyqtwebengine = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtwebengine { pythonPackages = self; }; |