qutebrowser: use correct plugin versions
Since PyQt uses Qt 5.5, we need to use the Qt plugins from 5.5 as well, and gstreamer plugins from 1.0.
This commit is contained in:
parent
2d0893088f
commit
dbd3a5ff20
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchgit, python, buildPythonPackage, qtmultimedia, pyqt5
|
||||
, jinja2, pygments, pyyaml, pypeg2, gst_plugins_base, gst_plugins_good
|
||||
, gst_ffmpeg }:
|
||||
, jinja2, pygments, pyyaml, pypeg2, gst-plugins-base, gst-plugins-good
|
||||
, gst-plugins-bad, gst-libav, wrapGAppsHook, glib_networking }:
|
||||
|
||||
let version = "0.4.1"; in
|
||||
|
||||
@ -17,13 +17,15 @@ buildPythonPackage {
|
||||
# Needs tox
|
||||
doCheck = false;
|
||||
|
||||
buildInputs = [ wrapGAppsHook
|
||||
gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav
|
||||
glib_networking ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
python pyyaml pyqt5 jinja2 pygments pypeg2
|
||||
];
|
||||
|
||||
makeWrapperArgs = ''
|
||||
--prefix GST_PLUGIN_PATH : "${stdenv.lib.makeSearchPath "lib/gstreamer-0.10"
|
||||
[ gst_plugins_base gst_plugins_good gst_ffmpeg ]}"
|
||||
--prefix QT_PLUGIN_PATH : "${qtmultimedia}/lib/qt5/plugins"
|
||||
'';
|
||||
|
||||
|
@ -12974,8 +12974,9 @@ let
|
||||
gst_plugins_bad = null;
|
||||
};
|
||||
|
||||
qutebrowser = qt5.callPackage ../applications/networking/browsers/qutebrowser {
|
||||
qutebrowser = qt55.callPackage ../applications/networking/browsers/qutebrowser {
|
||||
inherit (python34Packages) buildPythonPackage python pyqt5 jinja2 pygments pyyaml pypeg2;
|
||||
inherit (gst_all_1) gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav;
|
||||
};
|
||||
|
||||
rabbitvcs = callPackage ../applications/version-management/rabbitvcs {};
|
||||
|
Loading…
Reference in New Issue
Block a user