From 7390c0e31fc84da6dd8c98d190654a4931b8db36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 15 Feb 2010 17:10:35 +0000
Subject: [PATCH] Making pulseaudio optional on libao.

svn path=/nixpkgs/trunk/; revision=20018
---
 pkgs/development/libraries/libao/default.nix | 5 +++--
 pkgs/top-level/all-packages.nix              | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix
index 264c51ef4797..856980f10253 100644
--- a/pkgs/development/libraries/libao/default.nix
+++ b/pkgs/development/libraries/libao/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, pulseaudio }:
+{ stdenv, fetchurl, pkgconfig, pulseaudio
+, usePulseAudio }:
 
 stdenv.mkDerivation {
   name = "libao-0.8.8";
@@ -7,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "e52e05af6b10f42d2ee9845df1a581bf2b352060eabf7946aee0a600c3878954";
   };
 
-  buildInputs = [ pkgconfig pulseaudio ];
+  buildInputs = [ pkgconfig ] ++ stdenv.lib.optional usePulseAudio pulseaudio;
 
   meta = {
     longDescription = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1bc3b90cae3b..afd89ec48835 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4059,6 +4059,7 @@ let
 
   libao = import ../development/libraries/libao {
     inherit stdenv fetchurl pkgconfig pulseaudio;
+    usePulseAudio = getConfig [ "pulseaudio" ] true;
   };
 
   libarchive = import ../development/libraries/libarchive {