lol

qutebrowser: Qt 5 infrastructure update

+5 -4
+4 -3
pkgs/applications/networking/browsers/qutebrowser/default.nix
··· 1 - { stdenv, fetchgit, python, buildPythonPackage, qt5, pyqt5, jinja2, pygments, pyyaml, pypeg2, 2 - gst_plugins_base, gst_plugins_good, gst_ffmpeg }: 1 + { stdenv, fetchgit, python, buildPythonPackage, qtmultimedia, pyqt5 2 + , jinja2, pygments, pyyaml, pypeg2, gst_plugins_base, gst_plugins_good 3 + , gst_ffmpeg }: 3 4 4 5 let version = "0.4.1"; in 5 6 ··· 23 24 makeWrapperArgs = '' 24 25 --prefix GST_PLUGIN_PATH : "${stdenv.lib.makeSearchPath "lib/gstreamer-0.10" 25 26 [ gst_plugins_base gst_plugins_good gst_ffmpeg ]}" 26 - --prefix QT_PLUGIN_PATH : "${qt5.multimedia}/lib/qt5/plugins" 27 + --prefix QT_PLUGIN_PATH : "${qtmultimedia}/lib/qt5/plugins" 27 28 ''; 28 29 29 30 meta = {
+1 -1
pkgs/top-level/all-packages.nix
··· 12893 12893 gst_plugins_bad = null; 12894 12894 }; 12895 12895 12896 - qutebrowser = callPackage ../applications/networking/browsers/qutebrowser { 12896 + qutebrowser = qt5.callPackage ../applications/networking/browsers/qutebrowser { 12897 12897 inherit (python34Packages) buildPythonPackage python pyqt5 jinja2 pygments pyyaml pypeg2; 12898 12898 }; 12899 12899