public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moves gtksupport from gst-plugins-good to gst-plugins-bad

Browse Source
This commit is contained in:
Bastian Köcher 2018-04-04 17:43:36 +02:00
parent 4a945a03fd
commit 9ad4ca13c3
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/gstreamer/bad/default.nix
View File

@ -1,7 +1,6 @@
{ stdenv, fetchurl, fetchpatch, meson, ninja, gettext { stdenv, fetchurl, fetchpatch, meson, ninja, gettext
, pkgconfig, python, gst-plugins-base, orc , pkgconfig, python, gst-plugins-base, orc
, faacSupport ? false, faac ? null , faacSupport ? false, faac ? null
, gtkSupport ? false, gtk3 ? null
, faad2, libass, libkate, libmms , faad2, libass, libkate, libmms
, libmodplug, mpeg2dec, mpg123 , libmodplug, mpeg2dec, mpg123
, openjpeg, libopus, librsvg , openjpeg, libopus, librsvg
@ -12,7 +11,6 @@
}: }:
assert faacSupport -> faac != null; assert faacSupport -> faac != null;
assert gtkSupport -> gtk3 != null;
let let
inherit (stdenv.lib) optional optionalString; inherit (stdenv.lib) optional optionalString;
@ -62,7 +60,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gst-plugins-base orc gst-plugins-base orc
faad2 gtk3 libass libkate libmms faad2 libass libkate libmms
libmodplug mpeg2dec mpg123 libmodplug mpeg2dec mpg123
openjpeg libopus librsvg openjpeg libopus librsvg
fluidsynth libvdpau fluidsynth libvdpau
@ -71,8 +69,6 @@ stdenv.mkDerivation rec {
] ]
++ libintlOrEmpty ++ libintlOrEmpty
++ optional faacSupport faac ++ optional faacSupport faac
# for gtksink
++ optional gtkSupport gtk3
++ optional stdenv.isLinux wayland ++ optional stdenv.isLinux wayland
# wildmidi requires apple's OpenAL # wildmidi requires apple's OpenAL
# TODO: package apple's OpenAL, fix wildmidi, include on Darwin # TODO: package apple's OpenAL, fix wildmidi, include on Darwin

7
pkgs/development/libraries/gstreamer/good/default.nix
View File

@ -5,8 +5,11 @@
, cairo, gdk_pixbuf, aalib, libcaca , cairo, gdk_pixbuf, aalib, libcaca
, libsoup, libpulseaudio, libintlOrEmpty , libsoup, libpulseaudio, libintlOrEmpty
, darwin, lame, mpg123, twolame , darwin, lame, mpg123, twolame
, gtkSupport ? false, gtk3 ? null
}: }:
assert gtkSupport -> gtk3 != null;
let let
inherit (stdenv.lib) optionals optionalString; inherit (stdenv.lib) optionals optionalString;
in in
@ -44,7 +47,9 @@ stdenv.mkDerivation rec {
] ]
++ libintlOrEmpty ++ libintlOrEmpty
++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] ++ 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"; LDFLAGS = optionalString stdenv.isDarwin "-lintl";
} }