From 0edae74119d5353dea7898f245e824c52ac48513 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 1 Jul 2017 04:47:32 +0200 Subject: [PATCH 1/2] gst_all_1.gst-plugins-bad: allow building gtksink plugin Corebird requires gtksink gstreamer plugin to play videos. [1] The plugin, however, is only built when GTK is available. This patch adds gtk3 as an optional dependency to gst_all_1.gst-plugins-bad package, allowing the build of gtksink. [1]: https://github.com/baedert/corebird/issues/431 --- pkgs/development/libraries/gstreamer/bad/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 4efef2582118..69378d95a301 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, python, gst-plugins-base, orc , faacSupport ? false, faac ? null +, gtkSupport ? false, gtk3 ? null , faad2, libass, libkate, libmms , libmodplug, mpeg2dec, mpg123 , openjpeg, libopus, librsvg @@ -10,6 +11,7 @@ }: assert faacSupport -> faac != null; +assert gtkSupport -> gtk3 != null; let inherit (stdenv.lib) optional optionalString; @@ -41,7 +43,7 @@ stdenv.mkDerivation rec { buildInputs = [ gst-plugins-base orc - faad2 libass libkate libmms + faad2 gtk3 libass libkate libmms libmodplug mpeg2dec mpg123 openjpeg libopus librsvg fluidsynth libvdpau @@ -50,6 +52,8 @@ stdenv.mkDerivation rec { ] ++ libintlOrEmpty ++ optional faacSupport faac + # for gtksink + ++ optional gtkSupport gtk3 ++ optional stdenv.isLinux wayland # wildmidi requires apple's OpenAL # TODO: package apple's OpenAL, fix wildmidi, include on Darwin From e564f16b7fc31462f9819099e99191baf703b38a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 17 Jul 2017 15:51:20 +0200 Subject: [PATCH 2/2] corebird: fix video playback Corebird requires gst-plugins-bad compiled with GTK support to play videos. This commit enables the GTK support. --- pkgs/applications/networking/corebird/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix index 7b67ad235e3a..288c800dd163 100644 --- a/pkgs/applications/networking/corebird/default.nix +++ b/pkgs/applications/networking/corebird/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 json_glib sqlite libsoup gettext vala_0_32 gnome3.rest gnome3.dconf gnome3.gspell glib_networking - ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav ]); + ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good (gst-plugins-bad.override { gtkSupport = true; }) gst-libav ]); meta = { description = "Native Gtk+ Twitter client for the Linux desktop";