qutebrowser: use makeQtWrapper

Fixes #15597.
This commit is contained in:
Gabriel Ebner 2016-06-19 14:42:13 +02:00
parent 5862c38d9d
commit 9988488fc6

View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, python, buildPythonApplication, qtmultimedia, pyqt5 { stdenv, fetchurl, python, buildPythonApplication, qtmultimedia, pyqt5
, jinja2, pygments, pyyaml, pypeg2, gst-plugins-base, gst-plugins-good , jinja2, pygments, pyyaml, pypeg2, gst-plugins-base, gst-plugins-good
, gst-plugins-bad, gst-libav, wrapGAppsHook, glib_networking }: , gst-plugins-bad, gst-libav, wrapGAppsHook, glib_networking, makeQtWrapper }:
let version = "0.7.0"; in let version = "0.7.0"; in
@ -16,7 +16,8 @@ buildPythonApplication rec {
# Needs tox # Needs tox
doCheck = false; doCheck = false;
buildInputs = [ wrapGAppsHook buildInputs = [ wrapGAppsHook makeQtWrapper
qtmultimedia
gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav
glib_networking ]; glib_networking ];
@ -24,8 +25,9 @@ buildPythonApplication rec {
python pyyaml pyqt5 jinja2 pygments pypeg2 python pyyaml pyqt5 jinja2 pygments pypeg2
]; ];
makeWrapperArgs = '' postInstall = ''
--prefix QT_PLUGIN_PATH : "${qtmultimedia}/lib/qt5/plugins" mv $out/bin/qutebrowser $out/bin/.qutebrowser-noqtpath
makeQtWrapper $out/bin/.qutebrowser-noqtpath $out/bin/qutebrowser
''; '';
meta = { meta = {