From 777f805eba320d3f7770344636a7cdae46ec3dfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 11 May 2009 19:57:42 +0000
Subject: [PATCH] SDL: Add PulseAudio support.

svn path=/nixpkgs/trunk/; revision=15555
---
 pkgs/development/libraries/SDL/default.nix | 17 ++++++++++++-----
 pkgs/top-level/all-packages.nix            |  2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index daa77c8090c..6acd0bf66d9 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -1,9 +1,12 @@
-{ stdenv, fetchurl, x11, libXrandr, openglSupport ? false, mesa ? null
+{ stdenv, fetchurl, x11, libXrandr, pkgconfig
+, openglSupport ? false, mesa ? null
 , alsaSupport ? true, alsaLib ? null
+, pulseaudioSupport ? true, pulseaudio ? null
 }:
 
 assert openglSupport -> mesa != null;
 assert alsaSupport -> alsaLib != null;
+assert pulseaudioSupport -> pulseaudio != null;
 
 stdenv.mkDerivation {
   name = "SDL-1.2.13";
@@ -15,12 +18,16 @@ stdenv.mkDerivation {
   
   propagatedBuildInputs = [x11 libXrandr];
   
-  buildInputs =
+  buildInputs = [ pkgconfig ] ++
     stdenv.lib.optional openglSupport mesa ++
-    stdenv.lib.optional alsaSupport alsaLib;
-    
+    stdenv.lib.optional alsaSupport alsaLib ++
+    stdenv.lib.optional pulseaudioSupport pulseaudio;
+
+  # XXX: By default, SDL wants to dlopen() PulseAudio, in which case
+  # we must arrange to add it to its RPATH; however, `patchelf' seems
+  # to fail at doing this, hence `--disable-pulseaudio-shared'.
   configureFlags = ''
-    --disable-x11-shared --disable-alsa-shared --enable-rpath
+    --disable-x11-shared --disable-alsa-shared --enable-rpath --disable-pulseaudio-shared
     ${if alsaSupport then "--with-alsa-prefix=${alsaLib}/lib" else ""}
   '';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index da03ee8b5e5..3319c6bf0ec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3894,7 +3894,7 @@ let
   };
 
   SDL = import ../development/libraries/SDL {
-    inherit fetchurl stdenv x11 mesa alsaLib;
+    inherit fetchurl stdenv pkgconfig x11 mesa alsaLib pulseaudio;
     inherit (xlibs) libXrandr;
     openglSupport = mesaSupported;
     alsaSupport = true;