From b36fdd3d13e854413d49545f797870eee84979bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 29 Jan 2009 20:50:46 +0000
Subject: [PATCH] Switch to ALSA 1.0.19.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13911
---
pkgs/top-level/all-packages.nix | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4aec8167b17..a00dd26bd7d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5795,8 +5795,8 @@ let
intltool gettext;
inherit (gtkLibs) glib;
inherit (xlibs) libX11 libICE libSM;
+ inherit (alsa) alsaLib; # Needs ALSA >= 1.0.17.
gconf = gnome.GConf;
- alsaLib = alsa_1_0_19.alsaLib; # Needs ALSA >= 1.0.17.
};
tomcat_connectors = import ../servers/http/apache-modules/tomcat-connectors {
@@ -5926,21 +5926,14 @@ let
inherit fetchurl stdenv;
};
- alsa = composedArgsAndFun (selectVersion ../os-specific/linux/alsa "1.0.16") {
+ alsa = import ../os-specific/linux/alsa/1.0.19.nix {
inherit fetchurl stdenv ncurses gettext;
+ version = "1.0.19";
};
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;
};