public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qarte: use pyqt5_with_qtmultimedia

Browse Source 
Otherwise, qarte fails at run-time with:

>     from PyQt5.QtMultimedia import QMediaPlayer
> ModuleNotFoundError: No module named 'PyQt5.QtMultimedia'
This commit is contained in:
Vincent Laporte 2019-08-27 05:39:43 +00:00
parent e063d084de
commit ef15478313
No known key found for this signature in database
GPG Key ID: EBD582ADDDB1F81F
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/video/qarte/default.nix
View File

@ -1,7 +1,7 @@
{ mkDerivation, lib, fetchbzr, python3, rtmpdump }: { mkDerivation, lib, fetchbzr, python3, rtmpdump }:
let let
pythonEnv = python3.withPackages (ps: with ps; [ pyqt5 ]); pythonEnv = python3.withPackages (ps: with ps; [ pyqt5_with_qtmultimedia ]);
in mkDerivation { in mkDerivation {
name = "qarte-4.6.0"; name = "qarte-4.6.0";
src = fetchbzr { src = fetchbzr {

3
pkgs/development/python-modules/pyqt/5.x.nix
View File

@ -6,6 +6,7 @@
, qtdeclarative , qtdeclarative
, qtwebchannel , qtwebchannel
, withConnectivity ? false, qtconnectivity , withConnectivity ? false, qtconnectivity
, withMultimedia ? false, qtmultimedia
, withWebKit ? false, qtwebkit , withWebKit ? false, qtwebkit
, withWebSockets ? false, qtwebsockets , withWebSockets ? false, qtwebsockets
}: }:
@ -50,6 +51,7 @@ in buildPythonPackage rec {
qtwebchannel qtwebchannel
] ]
++ lib.optional withConnectivity qtconnectivity ++ lib.optional withConnectivity qtconnectivity
++ lib.optional withMultimedia qtmultimedia
++ lib.optional withWebKit qtwebkit ++ lib.optional withWebKit qtwebkit
++ lib.optional withWebSockets qtwebsockets ++ lib.optional withWebSockets qtwebsockets
; ;
@ -121,6 +123,7 @@ in buildPythonPackage rec {
] ]
++ lib.optional withWebSockets "PyQt5.QtWebSockets" ++ lib.optional withWebSockets "PyQt5.QtWebSockets"
++ lib.optional withWebKit "PyQt5.QtWebKit" ++ lib.optional withWebKit "PyQt5.QtWebKit"
++ lib.optional withMultimedia "PyQt5.QtMultimedia"
++ lib.optional withConnectivity "PyQt5.QtConnectivity" ++ lib.optional withConnectivity "PyQt5.QtConnectivity"
; ;
imports = lib.concatMapStrings (module: "import ${module};") modules; imports = lib.concatMapStrings (module: "import ${module};") modules;

2
pkgs/top-level/python-packages.nix
View File

@ -984,6 +984,8 @@ in {
*/ */
pyqt5_with_qtwebkit = self.pyqt5.override { withWebKit = true; }; pyqt5_with_qtwebkit = self.pyqt5.override { withWebKit = true; };
pyqt5_with_qtmultimedia = self.pyqt5.override { withMultimedia = true; };
pyqtwebengine = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtwebengine { pyqtwebengine = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtwebengine {
pythonPackages = self; pythonPackages = self;
}; };