diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-04-05 11:37:15 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-04-05 11:37:15 +0200 |
| commit | cb1a20499a8438ea1f15140dc090256e7690035e (patch) | |
| tree | f0deb5149dbb73d052e6700c03cc790c0d55fd46 /pkgs/development/libraries/gstreamer | |
| parent | 79b3d1b33d3dcd2e82003859cd296f4d1a82567e (diff) | |
| parent | 9fa17c5957a2bf161b659f5c6cd7b160e1826e06 (diff) | |
| download | nixpkgs-cb1a20499a8438ea1f15140dc090256e7690035e.tar nixpkgs-cb1a20499a8438ea1f15140dc090256e7690035e.tar.gz nixpkgs-cb1a20499a8438ea1f15140dc090256e7690035e.tar.bz2 nixpkgs-cb1a20499a8438ea1f15140dc090256e7690035e.tar.lz nixpkgs-cb1a20499a8438ea1f15140dc090256e7690035e.tar.xz nixpkgs-cb1a20499a8438ea1f15140dc090256e7690035e.tar.zst nixpkgs-cb1a20499a8438ea1f15140dc090256e7690035e.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/libraries/gstreamer')
| -rw-r--r-- | pkgs/development/libraries/gstreamer/good/default.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index d4e7b8c5da4..247a74e3a32 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -6,6 +6,9 @@ , libsoup, libpulseaudio, libintl , darwin, lame, mpg123, twolame , gtkSupport ? false, gtk3 ? null +, libXdamage +, libXext +, libXfixes , ncurses }: @@ -49,6 +52,11 @@ stdenv.mkDerivation rec { libdv libvpx speex flac taglib cairo gdk_pixbuf aalib libcaca libsoup libshout lame mpg123 twolame libintl + # TODO: Remove the comments once https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/commit/e234932dc703e51a0e1aa3b9c408f12758b12335 + # is merged and available in nixpkgs. + libXdamage # present feature but undeclared in meson_options.txt, see https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/issues/553 + libXext # present feature but undeclared in meson_options.txt, see https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/issues/553 + libXfixes # present feature but undeclared in meson_options.txt, see https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/issues/553 ncurses ] ++ optional gtkSupport gtk3 # for gtksink |