From be5f4082fd817703e5ee17a2ebd2629811a56100 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 29 May 2015 14:38:53 -0700
Subject: [PATCH] pulseaudio: Remove default derivation

---
 pkgs/applications/kde-apps-15.04/default.nix | 2 +-
 pkgs/desktops/plasma-5.3/default.nix         | 2 +-
 pkgs/games/steam/chrootenv.nix               | 2 +-
 pkgs/misc/emulators/wine/staging.nix         | 2 +-
 pkgs/top-level/all-packages.nix              | 4 +++-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix
index 9cab1775c425..661c8c3acb58 100644
--- a/pkgs/applications/kde-apps-15.04/default.nix
+++ b/pkgs/applications/kde-apps-15.04/default.nix
@@ -117,7 +117,7 @@ let
         OpenEXR = openexr;
         Poppler = poppler_qt4;
         Prison = prison;
-        PulseAudio = pulseaudio;
+        PulseAudio = libpulseaudio;
         PythonLibrary = python;
         Qalculate = libqalculate;
         QCA2 = qca2;
diff --git a/pkgs/desktops/plasma-5.3/default.nix b/pkgs/desktops/plasma-5.3/default.nix
index 7ff2d5fe8156..c4fb624a3771 100644
--- a/pkgs/desktops/plasma-5.3/default.nix
+++ b/pkgs/desktops/plasma-5.3/default.nix
@@ -53,7 +53,7 @@ let
         GTK3 = gtk3;
         Libinput = libinput;
         LibSSH = libssh;
-        PulseAudio = pulseaudio;
+        PulseAudio = libpulseaudio;
         Taglib = taglib;
         USB = libusb;
         Wayland = wayland;
diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index b8e5c6467584..1876e81dc315 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -56,7 +56,7 @@ buildFHSUserEnv {
       pkgs.alsaLib
       pkgs.libvorbis
       pkgs.openal
-      pkgs.pulseaudio
+      pkgs.libpulseaudio
 
       pkgs.flashplayer
 
diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix
index beea0bb3c125..1de37f56504b 100644
--- a/pkgs/misc/emulators/wine/staging.nix
+++ b/pkgs/misc/emulators/wine/staging.nix
@@ -15,7 +15,7 @@ let v = (import ./versions.nix).staging;
 in assert (builtins.parseDrvName wine.name).version == version;
 
 stdenv.lib.overrideDerivation wine (self: {
-  nativeBuildInputs = build-inputs [ "pulseaudio" libtxc_dxtn_Name ] self.nativeBuildInputs; 
+  nativeBuildInputs = build-inputs [ "libpulseaudio" libtxc_dxtn_Name ] self.nativeBuildInputs; 
   buildInputs = build-inputs [ "perl" "utillinux" "autoconf" ] self.buildInputs;
 
   name = "${self.name}-staging";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ebd50429c540..6c0e785846a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8794,7 +8794,9 @@ let
     prefix = "lib";
   };
 
-  pulseaudio = pulseaudioFull.override {
+  # Name is changed to prevent use in packages
+  # please use libpulseaudio instead
+  pulseaudioLight = pulseaudioFull.override {
     # The following are disabled in the default build, because if this
     # functionality is desired, they are only needed in the PulseAudio
     # server.