diff options
| author | Russell O'Connor <roconnor@theorem.ca> | 2010-10-02 23:12:59 +0000 |
|---|---|---|
| committer | Russell O'Connor <roconnor@theorem.ca> | 2010-10-02 23:12:59 +0000 |
| commit | e99b3198fa0b0c3a0485feda4d34596d1319f405 (patch) | |
| tree | 6f8341b7868d0094e65c57236fb4093eed32eee5 /pkgs/desktops/kde-4.4/default.nix | |
| parent | cd73464fdfab20066b8298a46fb5db6a8239a49d (diff) | |
| download | nixlib-e99b3198fa0b0c3a0485feda4d34596d1319f405.tar nixlib-e99b3198fa0b0c3a0485feda4d34596d1319f405.tar.gz nixlib-e99b3198fa0b0c3a0485feda4d34596d1319f405.tar.bz2 nixlib-e99b3198fa0b0c3a0485feda4d34596d1319f405.tar.lz nixlib-e99b3198fa0b0c3a0485feda4d34596d1319f405.tar.xz nixlib-e99b3198fa0b0c3a0485feda4d34596d1319f405.tar.zst nixlib-e99b3198fa0b0c3a0485feda4d34596d1319f405.zip | |
Make pulseaudio support in phonon configurable.
svn path=/nixpkgs/trunk/; revision=24027
Diffstat (limited to 'pkgs/desktops/kde-4.4/default.nix')
| -rw-r--r-- | pkgs/desktops/kde-4.4/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index 2a7b22e8acd0..bbd654f5da29 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; |