From 090e1f118004557e9c4966be0df480de7e06343b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 12 Feb 2009 22:31:23 +0000
Subject: [PATCH] * alsa-util suddenly needs --disable-xmlto.  Don't know why. 
 Also got   rid of some old versions.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14062
---
 pkgs/os-specific/linux/alsa/1.0.14.nix | 14 --------------
 pkgs/os-specific/linux/alsa/1.0.16.nix | 14 --------------
 pkgs/os-specific/linux/alsa/1.0.19.nix | 18 +++++++++++-------
 pkgs/os-specific/linux/alsa/common.nix | 15 ++++++++++-----
 pkgs/top-level/all-packages.nix        |  1 -
 5 files changed, 21 insertions(+), 41 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/alsa/1.0.14.nix
 delete mode 100644 pkgs/os-specific/linux/alsa/1.0.16.nix

diff --git a/pkgs/os-specific/linux/alsa/1.0.14.nix b/pkgs/os-specific/linux/alsa/1.0.14.nix
deleted file mode 100644
index c7799af559a2..000000000000
--- a/pkgs/os-specific/linux/alsa/1.0.14.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-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
deleted file mode 100644
index 5cac6f268aa2..000000000000
--- a/pkgs/os-specific/linux/alsa/1.0.16.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-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;
-}
diff --git a/pkgs/os-specific/linux/alsa/1.0.19.nix b/pkgs/os-specific/linux/alsa/1.0.19.nix
index 60c848fcaccd..93b77d698a2f 100644
--- a/pkgs/os-specific/linux/alsa/1.0.19.nix
+++ b/pkgs/os-specific/linux/alsa/1.0.19.nix
@@ -1,14 +1,18 @@
-args: with args;
+{fetchurl, stdenv, ncurses, gettext}:
+
+let version = "1.0.19"; in
 
 rec {
-  alsaLib = (import ./common.nix) {
-    aName = "lib";
+  alsaLib = import ./common.nix {
+    pkgName = "lib";
     sha256 = "11i898dc6qbachn046gl6dg6g7bl2k8crddl97f3z5i57bcjdvij";
-  } args;
+    inherit fetchurl stdenv version;
+  };
 
-  alsaUtils = (import ./common.nix) {
-    aName = "utils";
+  alsaUtils = import ./common.nix {
+    pkgName = "utils";
     sha256 = "1bcchd5nwgb2hy0z9c6jxbqlzirkh6wvxv6nldjcwmvqmvsj8j8z";
     buildInputs = [alsaLib ncurses gettext];
-  } args;
+    inherit fetchurl stdenv version;
+  };
 }
diff --git a/pkgs/os-specific/linux/alsa/common.nix b/pkgs/os-specific/linux/alsa/common.nix
index b14d458d7378..13f98d01185e 100644
--- a/pkgs/os-specific/linux/alsa/common.nix
+++ b/pkgs/os-specific/linux/alsa/common.nix
@@ -1,16 +1,21 @@
-{aName, sha256, buildInputs ? [], propagatedBuildInputs ? [] } :
-args: with args; stdenv.mkDerivation rec {
-  name = "alsa-" + aName + "-" + version;
+{ stdenv, fetchurl, pkgName, sha256, version
+, buildInputs ? [], propagatedBuildInputs ? []
+}:
+
+stdenv.mkDerivation rec {
+  name = "alsa-${pkgName}-${version}";
 
   src = fetchurl {
-    url = "ftp://ftp.alsa-project.org/pub/" + aName + "/" + name + ".tar.bz2";
+    url = "ftp://ftp.alsa-project.org/pub/${pkgName}/${name}.tar.bz2";
     inherit sha256;
   };
 
   inherit buildInputs propagatedBuildInputs;
 
+  configureFlags = "--disable-xmlto";
+
   meta = {
-    description = "ALSA, the Advanced Linux Sound Architecture (${aName})";
+    description = "ALSA, the Advanced Linux Sound Architecture (${pkgName})";
 
     longDescription = ''
       The Advanced Linux Sound Architecture (ALSA) provides audio and
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 77192bda782c..cb27c4dcf9f7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6337,7 +6337,6 @@ let
 
   alsa = import ../os-specific/linux/alsa/1.0.19.nix {
     inherit fetchurl stdenv ncurses gettext;
-    version = "1.0.19";
   };
 
   alsaLib = alsa.alsaLib;