From a8a0edb60d0a7c4c4672e3511cc4604477efb28c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 15 Dec 2009 07:47:45 +0000 Subject: [PATCH] Fix GStreamer 'good' plugins svn path=/nixpkgs/trunk/; revision=18952 --- pkgs/development/libraries/gstreamer/default.nix | 2 +- .../libraries/gstreamer/gst-plugins-good/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index 2170bcd845bf..ff39f3bfd9b0 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -16,7 +16,7 @@ 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; + libavc1394 ladspaH taglib gdbm pulseaudio libsoup libcap; }; 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 690be7115cad..8829fcbed55b 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, ... +, libsoup, libcap, ... }: 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]; + taglib gdbm pulseaudio libsoup libcap]; buildInputs = [pkgconfig]; configureFlags = "--enable-ladspa"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1de403b37927..1ba617847b87 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3487,7 +3487,8 @@ let inherit lib stdenv fetchurl perl bison pkgconfig libxml2 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; + dbus libavc1394 ladspaH taglib pulseaudio gdbm bzip2 which makeOverridable + libcap; flex = flex2535; inherit (xorg) libX11 libXv libXext; inherit (gtkLibs) glib pango gtk;