From 7c22881aa8adf1dbd2f60960189c239b70e92f0e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 16 Apr 2010 20:19:22 +0000 Subject: [PATCH] * Build audacious with ffmpeg to get support for WMA and MPC. svn path=/nixpkgs/trunk/; revision=21138 --- pkgs/applications/audio/audacious/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 48ee3ed1d8d6..08548aa8b57b 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, gtk, libmowgli, libmcs , gettext, dbus_glib, libxml2, libmad, xlibs, alsaLib, libogg -, libvorbis, libcdio, libcddb, flac +, libvorbis, libcdio, libcddb, flac, ffmpeg }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ gettext pkgconfig glib gtk libmowgli libmcs libxml2 dbus_glib libmad xlibs.libXcomposite libogg libvorbis flac alsaLib libcdio - libcddb + libcddb ffmpeg ]; # Here we build bouth audacious and audacious-plugins in one diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 56a44e722b7a..f2145a2f2823 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6762,7 +6762,7 @@ let audacious = import ../applications/audio/audacious { inherit fetchurl stdenv gettext pkgconfig libmowgli libmcs dbus_glib libxml2 libmad xlibs alsaLib libogg libvorbis libcdio - libcddb flac; + libcddb flac ffmpeg; inherit (gtkLibs) glib gtk; };