From 449b6028a64fae427fdce4abf126825bd8aaf260 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Tue, 22 Sep 2015 18:45:45 +0200 Subject: [PATCH 1/2] qt5.multimedia: fix gstreamer support. --- pkgs/development/libraries/qt-5/5.4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.4/default.nix b/pkgs/development/libraries/qt-5/5.4/default.nix index 5862fb6708d..136c352d1aa 100644 --- a/pkgs/development/libraries/qt-5/5.4/default.nix +++ b/pkgs/development/libraries/qt-5/5.4/default.nix @@ -152,7 +152,7 @@ let multimedia = callPackage ( - { qtSubmodule, base, declarative + { qtSubmodule, base, declarative, pkgconfig , alsaLib, gstreamer, gst_plugins_base, libpulseaudio }: @@ -160,7 +160,7 @@ let name = "qtmultimedia"; qtInputs = [ base declarative ]; buildInputs = [ - alsaLib gstreamer gst_plugins_base libpulseaudio + pkgconfig alsaLib gstreamer gst_plugins_base libpulseaudio ]; } ) From c33641b8d4ddc3b7ae96cd9f57e2be77f2075886 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Tue, 22 Sep 2015 19:33:52 +0200 Subject: [PATCH 2/2] qutebrowser: set gstreamer and qt plugin paths. --- .../networking/browsers/qutebrowser/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index c90c13b190d..7f2190ab82c 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -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 @@ -19,6 +20,12 @@ buildPythonPackage { 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 = { homepage = https://github.com/The-Compiler/qutebrowser; description = "Keyboard-focused browser with a minimal GUI";