diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index c1d28e58c4e..c83f0b38437 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl, fetchpatch, meson, ninja, gettext , pkgconfig, python, gst-plugins-base, orc , faacSupport ? false, faac ? null -, gtkSupport ? false, gtk3 ? null , faad2, libass, libkate, libmms , libmodplug, mpeg2dec, mpg123 , openjpeg, libopus, librsvg @@ -12,7 +11,6 @@ }: assert faacSupport -> faac != null; -assert gtkSupport -> gtk3 != null; let inherit (stdenv.lib) optional optionalString; @@ -62,7 +60,7 @@ stdenv.mkDerivation rec { buildInputs = [ gst-plugins-base orc - faad2 gtk3 libass libkate libmms + faad2 libass libkate libmms libmodplug mpeg2dec mpg123 openjpeg libopus librsvg fluidsynth libvdpau @@ -71,8 +69,6 @@ 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 diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index aa826456563..960c03b52e2 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -5,8 +5,11 @@ , cairo, gdk_pixbuf, aalib, libcaca , libsoup, libpulseaudio, libintlOrEmpty , darwin, lame, mpg123, twolame +, gtkSupport ? false, gtk3 ? null }: +assert gtkSupport -> gtk3 != null; + let inherit (stdenv.lib) optionals optionalString; in @@ -44,7 +47,9 @@ stdenv.mkDerivation rec { ] ++ libintlOrEmpty ++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] - ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ]; + ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ] + # for gtksink + ++ optionals gtkSupport [ gtk3 ]; LDFLAGS = optionalString stdenv.isDarwin "-lintl"; }