From c5fafa326b1e32e8aadb548d45845239cc688da8 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 6 Feb 2008 22:45:59 +0000
Subject: [PATCH] Alsa: 1.0.16

svn path=/nixpkgs/branches/stdenv-updates/; revision=10531
---
 pkgs/os-specific/linux/alsa/1.0.14.nix          | 14 ++++++++++++++
 pkgs/os-specific/linux/alsa/1.0.16.nix          | 15 +++++++++++++++
 pkgs/os-specific/linux/alsa/common.nix          | 13 +++++++++++++
 pkgs/os-specific/linux/alsa/library/default.nix | 13 -------------
 pkgs/os-specific/linux/alsa/utils/default.nix   | 14 --------------
 pkgs/top-level/all-packages.nix                 | 12 ++++++------
 6 files changed, 48 insertions(+), 33 deletions(-)
 create mode 100644 pkgs/os-specific/linux/alsa/1.0.14.nix
 create mode 100644 pkgs/os-specific/linux/alsa/1.0.16.nix
 create mode 100644 pkgs/os-specific/linux/alsa/common.nix
 delete mode 100644 pkgs/os-specific/linux/alsa/library/default.nix
 delete mode 100644 pkgs/os-specific/linux/alsa/utils/default.nix

diff --git a/pkgs/os-specific/linux/alsa/1.0.14.nix b/pkgs/os-specific/linux/alsa/1.0.14.nix
new file mode 100644
index 00000000000..c7799af559a
--- /dev/null
+++ b/pkgs/os-specific/linux/alsa/1.0.14.nix
@@ -0,0 +1,14 @@
+args: with args;
+
+rec {
+  alsaLib = (import ./common.nix) {
+    aName = "lib";
+    sha256 = "18xhm53adgss20jnva2nfl9gk46kb5an6ah820pazqn0ykd97rh1";
+  } args;
+
+  alsaUtils = (import ./common.nix) {
+    aName = "utils";
+    sha256 = "1jx5bwa8abx7aih4lymx4bnrmyip2yb0rp1mza97wpni1q7n6z9h";
+    buildInputs = [alsaLib ncurses gettext];
+  } args;
+}
diff --git a/pkgs/os-specific/linux/alsa/1.0.16.nix b/pkgs/os-specific/linux/alsa/1.0.16.nix
new file mode 100644
index 00000000000..01b8bc932db
--- /dev/null
+++ b/pkgs/os-specific/linux/alsa/1.0.16.nix
@@ -0,0 +1,15 @@
+args: with args;
+
+rec {
+  alsaLib = (import ./common.nix) {
+    aName = "lib";
+    sha256 = "1k96razf5h7blidh5ib54plcrfnbysvwm7vhvz28b4cy20zv66df";
+  } args;
+
+  alsaUtils = (import ./common.nix) {
+    aName = "utils";
+    sha256 = "10bj4pw2hp3f6qzkxsrlnvsxjlpqha696fn10gzdnnzym072skzb";
+    buildInputs = [alsaLib ncurses gettext];
+  } args;
+}
+0rb5rc8ppxjrpg5bcb5fw24v7gm5983zphz9762i8is5q2hbcqif
diff --git a/pkgs/os-specific/linux/alsa/common.nix b/pkgs/os-specific/linux/alsa/common.nix
new file mode 100644
index 00000000000..218a4b91c8e
--- /dev/null
+++ b/pkgs/os-specific/linux/alsa/common.nix
@@ -0,0 +1,13 @@
+{aName, sha256, buildInputs ? [], propagatedBuildInputs ? [] } :
+args: with args; stdenv.mkDerivation rec {
+  name = "alsa-" + aName + "-" + version;
+
+  src = fetchurl {
+    url = "ftp://ftp.alsa-project.org/pub/" + aName + "/" + name + ".tar.bz2";
+    inherit sha256;
+  };
+
+  inherit buildInputs propagatedBuildInputs;
+
+  meta = { homepage = http://www.alsa-project.org; };
+}
diff --git a/pkgs/os-specific/linux/alsa/library/default.nix b/pkgs/os-specific/linux/alsa/library/default.nix
deleted file mode 100644
index 6ab8143c7ab..00000000000
--- a/pkgs/os-specific/linux/alsa/library/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "alsa-lib-1.0.14";
-  src = fetchurl {
-    url = ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.14.tar.bz2;
-	sha256 = "18xhm53adgss20jnva2nfl9gk46kb5an6ah820pazqn0ykd97rh1";
-  };
-
-  meta = {
-	  homepage = http://www.alsa-project.org;
-  };
-}
diff --git a/pkgs/os-specific/linux/alsa/utils/default.nix b/pkgs/os-specific/linux/alsa/utils/default.nix
deleted file mode 100644
index 658d8d8e9f7..00000000000
--- a/pkgs/os-specific/linux/alsa/utils/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{stdenv, fetchurl, alsaLib, ncurses, gettext}:
-
-stdenv.mkDerivation {
-  name = "alsa-utils-1.0.14";
-  src = fetchurl {
-    url = ftp://ftp.alsa-project.org/pub/utils/alsa-utils-1.0.14.tar.bz2;
-    sha256 = "1jx5bwa8abx7aih4lymx4bnrmyip2yb0rp1mza97wpni1q7n6z9h";
-  };
-  buildInputs = [alsaLib ncurses gettext];
-
-  meta = {
-	  homepage = http://www.alsa-project.org;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cde6b883933..991d2149a37 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3228,10 +3228,14 @@ rec {
   };
   */
 
-  alsaLib = import ../os-specific/linux/alsa/library {
-    inherit fetchurl stdenv;
+  alsaFun = lib.sumArgs (selectVersion ../os-specific/linux/alsa "1.0.16") {
+    inherit fetchurl stdenv ncurses gettext;
   };
 
+  alsa = alsaFun null;
+
+  alsaLib = alsa.alsaLib;
+
   atherosFun = lib.sumArgs (selectVersion ../os-specific/linux/atheros "r3122") {
     inherit fetchurl stdenv builderDefs;
   };
@@ -3248,10 +3252,6 @@ rec {
     inherit fetchurl stdenv autoconf automake;
   };
 
-  alsaUtils = import ../os-specific/linux/alsa/utils {
-    inherit fetchurl stdenv alsaLib ncurses gettext;
-  };
-
   cramfsswap = import ../os-specific/linux/cramfsswap {
     inherit fetchurl stdenv zlib;
   };