From 5cdc569477c34b95bd3aed614f221bc133f6aee5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 21 Aug 2010 16:55:47 +0000
Subject: [PATCH] Allowing alsa utils to cross-build, and libao to output to
 alsa (not only to pulseAudio)

svn path=/nixpkgs/branches/stdenv-updates/; revision=23315
---
 pkgs/development/libraries/libao/default.nix  | 5 +++--
 pkgs/os-specific/linux/alsa-utils/default.nix | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix
index 856980f1025..ae70e775dd1 100644
--- a/pkgs/development/libraries/libao/default.nix
+++ b/pkgs/development/libraries/libao/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pulseaudio
+{ stdenv, fetchurl, pkgconfig, pulseaudio, alsaLib
 , usePulseAudio }:
 
 stdenv.mkDerivation {
@@ -8,7 +8,8 @@ stdenv.mkDerivation {
     sha256 = "e52e05af6b10f42d2ee9845df1a581bf2b352060eabf7946aee0a600c3878954";
   };
 
-  buildInputs = [ pkgconfig ] ++ stdenv.lib.optional usePulseAudio pulseaudio;
+  buildInputs = [ pkgconfig alsaLib ] ++ (if usePulseAudio then [ pulseaudio ]
+    else [ alsaLib ]);
 
   meta = {
     longDescription = ''
diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix
index e20163bfc97..ad092fa7821 100644
--- a/pkgs/os-specific/linux/alsa-utils/default.nix
+++ b/pkgs/os-specific/linux/alsa-utils/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1c7pl5k3d60wacnha8zfn2dixz7hiiaxvijis4559y15bs8mxl5p";
   };
   
-  buildInputs = [ alsaLib gettext ncurses ];
+  buildInputs = [ alsaLib ncurses ];
+  buildNativeInputs = [ gettext ];
   
   configureFlags = "--disable-xmlto";