From a8dc106b711589b2a8411747e66fbb4cd5eddf46 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Jul 2011 00:05:10 +0000
Subject: [PATCH] * alsa-plugins updated to 1.0.24.

svn path=/nixpkgs/branches/kde-4.7/; revision=27956
---
 .../linux/alsa-plugins/default.nix            | 24 +++++++++----------
 pkgs/top-level/all-packages.nix               |  5 +++-
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix
index dc36757e020..da46f7853fd 100644
--- a/pkgs/os-specific/linux/alsa-plugins/default.nix
+++ b/pkgs/os-specific/linux/alsa-plugins/default.nix
@@ -1,21 +1,21 @@
-{stdenv, fetchurl, lib, pkgconfig, alsaLib, pulseaudio, jackaudio}:
-stdenv.mkDerivation {
-  name = "alsa-plugins-1.0.23";
+{ stdenv, fetchurl, lib, pkgconfig, alsaLib, pulseaudio ? null, jackaudio ? null }:
+
+stdenv.mkDerivation rec {
+  name = "alsa-plugins-1.0.24";
 
   src = fetchurl {
-    url = ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-1.0.23.tar.bz2;
-    sha256 = "10ri5dpmhk028r0qvajswh2xl40kjd600h7hykq03vrkmn8jf6sw";
+    url = "ftp://ftp.alsa-project.org/pub/plugins/${name}.tar.bz2";
+    sha256 = "0qqjhqviv07456kshhm5dd132x81i9qb60vw24zhib7y5pmi53ps";
   };
 
-  # TODO make backends such as jack, pulseaudio optional
-  buildInputs = [pkgconfig alsaLib pulseaudio jackaudio];
+  buildInputs =
+    [ pkgconfig alsaLib ]
+    ++ stdenv.lib.optional (pulseaudio != null) pulseaudio
+    ++ stdenv.lib.optional (jackaudio != null) jackaudio;
 
   meta = { 
-    description = "plugins for alsa eg conneckt jack, pluseaudio applications easily to the daemons using alsa devices";
-    longDescription = "
-      use it like this: export ALSA_PLUGIN_DIRS=$(nix-build -A alsaPlugins)/lib/alsa-lib
-    ";
-    homepage = http://alsa-project.org;
+    description = "Various plugins for ALSA";
+    homepage = http://alsa-project.org/;
     license = "GPL2.1";
     maintainers = [lib.maintainers.marcweber];
     platforms = lib.platforms.linux;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 584986f75fc..7b922843cb1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4834,7 +4834,10 @@ let
 
   alsaLib = callPackage ../os-specific/linux/alsa-lib { };
 
-  alsaPlugins = callPackage ../os-specific/linux/alsa-plugins { };
+  alsaPlugins = callPackage ../os-specific/linux/alsa-plugins {
+    jackaudio = null;
+  };
+  
   alsaPluginWrapper = callPackage ../os-specific/linux/alsa-plugins/wrapper.nix { };
 
   alsaUtils = callPackage ../os-specific/linux/alsa-utils { };