From 48e3b81712f5f5f05e9f331d439a0d0f7d29491f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 15 Dec 2009 09:37:42 +0000
Subject: [PATCH] Adding libtasn1 dependency for gst-plugins

svn path=/nixpkgs/trunk/; revision=18956
---
 pkgs/development/libraries/gstreamer/default.nix           | 3 ++-
 .../libraries/gstreamer/gst-plugins-good/default.nix       | 7 +++++--
 pkgs/top-level/all-packages.nix                            | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix
index ff39f3bfd9b0..ce6a3736432d 100644
--- a/pkgs/development/libraries/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/default.nix
@@ -16,7 +16,8 @@ rec {
     inherit gstPluginsBase;
     inherit (args) fetchurl stdenv pkgconfig aalib cairo flac hal
       libjpeg zlib speex libpng libdv libcaca dbus libiec61883
-      libavc1394 ladspaH taglib gdbm pulseaudio libsoup libcap;
+      libavc1394 ladspaH taglib gdbm pulseaudio libsoup libcap 
+      libtasn1;
   };
 
   gstFfmpeg = makeOverridable (import ./gst-ffmpeg) {
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix
index 8829fcbed55b..ae3853d8b58a 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, pkgconfig, gstPluginsBase, aalib, cairo
 , flac , hal, libjpeg, zlib, speex, libpng, libdv, libcaca, dbus
 , libiec61883, libavc1394, ladspaH, taglib, gdbm, pulseaudio
-, libsoup, libcap, ...
+, libsoup, libcap, libtasn1, ...
 }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [gstPluginsBase aalib cairo flac hal libjpeg
     zlib speex libpng libdv libcaca dbus.libs libiec61883 libavc1394 ladspaH
-    taglib gdbm pulseaudio libsoup libcap];
+    taglib gdbm pulseaudio libsoup libcap libtasn1];
   buildInputs = [pkgconfig];
 
   configureFlags = "--enable-ladspa";
@@ -27,6 +27,9 @@ stdenv.mkDerivation rec {
 
     description = "`Good' plug-ins for GStreamer";
 
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+
     license = "LGPLv2+";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ba617847b87..712b95f35554 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3488,7 +3488,7 @@ let
       python alsaLib cdparanoia libogg libvorbis libtheora freetype liboil
       libjpeg zlib speex libpng libdv aalib cairo libcaca flac hal libiec61883
       dbus libavc1394 ladspaH taglib pulseaudio gdbm bzip2 which makeOverridable
-      libcap;
+      libcap libtasn1;
     flex = flex2535;
     inherit (xorg) libX11 libXv libXext;
     inherit (gtkLibs) glib pango gtk;