From e99b3198fa0b0c3a0485feda4d34596d1319f405 Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Sat, 2 Oct 2010 23:12:59 +0000 Subject: [PATCH] Make pulseaudio support in phonon configurable. svn path=/nixpkgs/trunk/; revision=24027 --- pkgs/desktops/kde-4.4/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index 2a7b22e8acd..bbd654f5da2 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -11,7 +11,8 @@ pkgs.recurseIntoAttrs (rec { phonon = import ./support/phonon { inherit (pkgs) stdenv fetchurl cmake pkgconfig; - inherit (pkgs) qt4 xineLib pulseaudio; + inherit (pkgs) qt4 xineLib; + pulseaudio = if pkgs.getConfig ["phonon" "pulseaudioSupport"] true then pkgs.pulseaudio else null; inherit (pkgs.gst_all) gstreamer gstPluginsBase; inherit (pkgs.xlibs) libXau libXdmcp libpthreadstubs; inherit automoc4;