From 3e14bb6fdf3e079e58e8b3556a7cf751a79e8835 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 4 Jul 2013 00:25:53 +1000 Subject: [PATCH] gst-plugins-base: fix build on darwin * remove alsaLib and cdparanoia from build inputs * add cairo to build inputs --- .../gstreamer/gst-plugins-base/default.nix | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix index 2ac325dc2822..e29be91c34b2 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix @@ -1,7 +1,5 @@ -{ fetchurl, stdenv, pkgconfig, python, gstreamer -, xlibs, alsaLib, cdparanoia, libogg -, libtheora, libvorbis, freetype, pango -, liboil, glib +{ fetchurl, stdenv, pkgconfig, python, gstreamer, xlibs, alsaLib, cdparanoia +, libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo , # Whether to build no plugins that have external dependencies # (except the ALSA plugin). minimalDeps ? false @@ -25,22 +23,25 @@ stdenv.mkDerivation rec { # TODO : v4l, libvisual buildInputs = - [ pkgconfig glib alsaLib ] + [ pkgconfig glib cairo ] + # can't build alsaLib on darwin + ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib ++ stdenv.lib.optionals (!minimalDeps) - [ xlibs.xlibs xlibs.libXv cdparanoia libogg libtheora libvorbis - freetype pango liboil - ]; + [ xlibs.xlibs xlibs.libXv libogg libtheora libvorbis freetype pango + liboil ] + # can't build cdparanoia on darwin + ++ stdenv.lib.optional (!minimalDeps && !stdenv.isDarwin) cdparanoia; propagatedBuildInputs = [ gstreamer ]; postInstall = "rm -rf $out/share/gtk-doc"; - meta = { - homepage = http://gstreamer.freedesktop.org; - + meta = with stdenv.lib; { + homepage = http://gstreamer.freedesktop.org; description = "Base plug-ins for GStreamer"; - - license = "LGPLv2+"; + license = licences.lgpl2Plus; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; }; }