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

Merge pull request #10003 from gebner/qutebrowser-youtube

Browse Source 
qutebrowser: youtube support
This commit is contained in:
Arseniy Seroka 2015-09-23 18:26:04 +03:00
commit d9b4d81a39
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,5 @@
{ stdenv, fetchgit, python, buildPythonPackage, qt5, pyqt5, jinja2, pygments, pyyaml, pypeg2 }: { stdenv, fetchgit, python, buildPythonPackage, qt5, pyqt5, jinja2, pygments, pyyaml, pypeg2,
gst_plugins_base, gst_plugins_good, gst_ffmpeg }:
let version = "0.4.0"; in let version = "0.4.0"; in
@ -19,6 +20,12 @@ buildPythonPackage {
python pyyaml pyqt5 jinja2 pygments pypeg2 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 : "${qt5.multimedia}/lib/qt5/plugins"
'';
meta = { meta = {
homepage = https://github.com/The-Compiler/qutebrowser; homepage = https://github.com/The-Compiler/qutebrowser;
description = "Keyboard-focused browser with a minimal GUI"; description = "Keyboard-focused browser with a minimal GUI";

4
pkgs/development/libraries/qt-5/5.4/default.nix
View File

@ -152,7 +152,7 @@ let
multimedia = callPackage multimedia = callPackage
( (
{ qtSubmodule, base, declarative { qtSubmodule, base, declarative, pkgconfig
, alsaLib, gstreamer, gst_plugins_base, libpulseaudio , alsaLib, gstreamer, gst_plugins_base, libpulseaudio
}: }:
@ -160,7 +160,7 @@ let
name = "qtmultimedia"; name = "qtmultimedia";
qtInputs = [ base declarative ]; qtInputs = [ base declarative ];
buildInputs = [ buildInputs = [
alsaLib gstreamer gst_plugins_base libpulseaudio pkgconfig alsaLib gstreamer gst_plugins_base libpulseaudio
]; ];
} }
) )