diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2017-07-17 17:50:27 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-17 17:50:27 +0200 |
commit | 28b7d016ca66a3ba287bfc7c2aa7f25d618a63f2 (patch) | |
tree | cd2f1eb11a2ca2bdb3e230f732a223395b2efc55 /pkgs | |
parent | f130ecdd304847fc7c0b182b97f1dfdc0b76a7d6 (diff) | |
parent | e564f16b7fc31462f9819099e99191baf703b38a (diff) | |
download | nixlib-28b7d016ca66a3ba287bfc7c2aa7f25d618a63f2.tar nixlib-28b7d016ca66a3ba287bfc7c2aa7f25d618a63f2.tar.gz nixlib-28b7d016ca66a3ba287bfc7c2aa7f25d618a63f2.tar.bz2 nixlib-28b7d016ca66a3ba287bfc7c2aa7f25d618a63f2.tar.lz nixlib-28b7d016ca66a3ba287bfc7c2aa7f25d618a63f2.tar.xz nixlib-28b7d016ca66a3ba287bfc7c2aa7f25d618a63f2.tar.zst nixlib-28b7d016ca66a3ba287bfc7c2aa7f25d618a63f2.zip |
Merge pull request #27005 from jtojnar/fix/corebird-gst
gst_all_1.gst-plugins-bad: build gtksink plugin
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/corebird/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/gstreamer/bad/default.nix | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix index 86a93309b1f6..376c70f3f446 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"; 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 |