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

qutebrowser: Qt 5 infrastructure update

Browse Source
This commit is contained in:
Thomas Tuegel 2015-12-19 22:11:52 -06:00
parent 1d331481fc
commit 143d6123dc
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/networking/browsers/qutebrowser/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchgit, python, buildPythonPackage, qt5, pyqt5, jinja2, pygments, pyyaml, pypeg2, { stdenv, fetchgit, python, buildPythonPackage, qtmultimedia, pyqt5
gst_plugins_base, gst_plugins_good, gst_ffmpeg }: , jinja2, pygments, pyyaml, pypeg2, gst_plugins_base, gst_plugins_good
, gst_ffmpeg }:
let version = "0.4.1"; in let version = "0.4.1"; in
@ -23,7 +24,7 @@ buildPythonPackage {
makeWrapperArgs = '' makeWrapperArgs = ''
--prefix GST_PLUGIN_PATH : "${stdenv.lib.makeSearchPath "lib/gstreamer-0.10" --prefix GST_PLUGIN_PATH : "${stdenv.lib.makeSearchPath "lib/gstreamer-0.10"
[ gst_plugins_base gst_plugins_good gst_ffmpeg ]}" [ gst_plugins_base gst_plugins_good gst_ffmpeg ]}"
--prefix QT_PLUGIN_PATH : "${qt5.multimedia}/lib/qt5/plugins" --prefix QT_PLUGIN_PATH : "${qtmultimedia}/lib/qt5/plugins"
''; '';
meta = { meta = {

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

@ -12893,7 +12893,7 @@ let
gst_plugins_bad = null; gst_plugins_bad = null;
}; };
qutebrowser = callPackage ../applications/networking/browsers/qutebrowser { qutebrowser = qt5.callPackage ../applications/networking/browsers/qutebrowser {
inherit (python34Packages) buildPythonPackage python pyqt5 jinja2 pygments pyyaml pypeg2; inherit (python34Packages) buildPythonPackage python pyqt5 jinja2 pygments pyyaml pypeg2;
}; };