From d17d9dfb39197b9ca02d65a6bb55e6046799c632 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 19 Jan 2009 20:21:23 +0000
Subject: [PATCH] ALSA 1.0.19.

svn path=/nixpkgs/trunk/; revision=13808
---
 pkgs/os-specific/linux/alsa/1.0.19.nix | 14 ++++++++++++++
 pkgs/os-specific/linux/alsa/common.nix | 11 ++++++++++-
 pkgs/top-level/all-packages.nix        |  9 ++++++++-
 3 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/os-specific/linux/alsa/1.0.19.nix

diff --git a/pkgs/os-specific/linux/alsa/1.0.19.nix b/pkgs/os-specific/linux/alsa/1.0.19.nix
new file mode 100644
index 00000000000..60c848fcacc
--- /dev/null
+++ b/pkgs/os-specific/linux/alsa/1.0.19.nix
@@ -0,0 +1,14 @@
+args: with args;
+
+rec {
+  alsaLib = (import ./common.nix) {
+    aName = "lib";
+    sha256 = "11i898dc6qbachn046gl6dg6g7bl2k8crddl97f3z5i57bcjdvij";
+  } args;
+
+  alsaUtils = (import ./common.nix) {
+    aName = "utils";
+    sha256 = "1bcchd5nwgb2hy0z9c6jxbqlzirkh6wvxv6nldjcwmvqmvsj8j8z";
+    buildInputs = [alsaLib ncurses gettext];
+  } args;
+}
diff --git a/pkgs/os-specific/linux/alsa/common.nix b/pkgs/os-specific/linux/alsa/common.nix
index 218a4b91c8e..b14d458d737 100644
--- a/pkgs/os-specific/linux/alsa/common.nix
+++ b/pkgs/os-specific/linux/alsa/common.nix
@@ -9,5 +9,14 @@ args: with args; stdenv.mkDerivation rec {
 
   inherit buildInputs propagatedBuildInputs;
 
-  meta = { homepage = http://www.alsa-project.org; };
+  meta = {
+    description = "ALSA, the Advanced Linux Sound Architecture (${aName})";
+
+    longDescription = ''
+      The Advanced Linux Sound Architecture (ALSA) provides audio and
+      MIDI functionality to the Linux-based operating system.
+    '';
+
+    homepage = http://www.alsa-project.org/;
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e50e7af7ee2..343656730fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5921,9 +5921,16 @@ let
   };
 
   alsaLib = alsa.alsaLib;
-
   alsaUtils = alsa.alsaUtils;
 
+  # A newer ALSA.  Make it the default during the next `stdenv-updates' merge.
+  alsa_1_0_19 = import ../os-specific/linux/alsa/1.0.19.nix {
+    inherit fetchurl stdenv ncurses gettext;
+    version = "1.0.19";
+  };
+  alsaLib_1_0_19 = alsa_1_0_19.alsaLib;
+  alsaUtils_1_0_19 = alsa_1_0_19.alsaUtils;
+
   blcr = builderDefsPackage (selectVersion ../os-specific/linux/blcr "0.6.5"){
     inherit perl;
   };