From dd75ac4355c185b6e4db33651aadc4c3669ad2c7 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 30 May 2015 14:27:47 +0200
Subject: Fix references to pulseaudio.

In NixOS/nixpkgs@be5f408, the "pulseaudio" attribute has been removed to
prevent accidentally using it if we just want to have the library, so
let's fix this on our side.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/user/aszlig/profiles/workstation/packages.nix | 2 +-
 pkgs/pvolctrl/default.nix                             | 4 ++--
 pkgs/sidplayfp/default.nix                            | 4 ++--
 pkgs/twitchstream/default.nix                         | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/user/aszlig/profiles/workstation/packages.nix b/modules/user/aszlig/profiles/workstation/packages.nix
index c3003e9d..4cd5de87 100644
--- a/modules/user/aszlig/profiles/workstation/packages.nix
+++ b/modules/user/aszlig/profiles/workstation/packages.nix
@@ -60,7 +60,7 @@ pkgs: with pkgs; [
   pavucontrol
   picard
   posix_man_pages
-  pulseaudio
+  pulseaudioLight
   vuizvui.pvolctrl
   python
   python3
diff --git a/pkgs/pvolctrl/default.nix b/pkgs/pvolctrl/default.nix
index 25edb27f..5701c19e 100644
--- a/pkgs/pvolctrl/default.nix
+++ b/pkgs/pvolctrl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pulseaudio }:
+{ stdenv, fetchurl, pkgconfig, libpulseaudio }:
 
 stdenv.mkDerivation rec {
   name = "pvolctrl-0.23";
@@ -31,5 +31,5 @@ stdenv.mkDerivation rec {
     install -D -T pvolctrl "$out/bin/pvolctrl"
   '';
 
-  buildInputs = [ pkgconfig pulseaudio ];
+  buildInputs = [ pkgconfig libpulseaudio ];
 }
diff --git a/pkgs/sidplayfp/default.nix b/pkgs/sidplayfp/default.nix
index 4304d4e4..c06da466 100644
--- a/pkgs/sidplayfp/default.nix
+++ b/pkgs/sidplayfp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, alsaLib, pulseaudio }:
+{ stdenv, fetchurl, pkgconfig, alsaLib, libpulseaudio }:
 
 let
   libsidplayfp = stdenv.mkDerivation rec {
@@ -24,6 +24,6 @@ in stdenv.mkDerivation rec {
     sed -i -e '/cerr.*\(Clear screen\|Move cursor\)/d' src/menu.cpp
   '';
 
-  buildInputs = [ pkgconfig libsidplayfp alsaLib pulseaudio ];
+  buildInputs = [ pkgconfig libsidplayfp alsaLib libpulseaudio ];
 }
 
diff --git a/pkgs/twitchstream/default.nix b/pkgs/twitchstream/default.nix
index 543ad261..b6d0b523 100644
--- a/pkgs/twitchstream/default.nix
+++ b/pkgs/twitchstream/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, writeScriptBin, ffmpeg_2, pulseaudio }:
+{ stdenv, fetchurl, writeScriptBin, ffmpeg_2, libpulseaudio }:
 
 # FIXME: Clean up this whole file!
 
@@ -46,11 +46,11 @@ let
       "--enable-libvo-aacenc"
     ];
     preConfigure = ''
-      addPkgConfigPath "${pulseaudio}"
+      addPkgConfigPath "${libpulseaudio}"
       addPkgConfigPath "${aacenc}"
     '';
     NIX_CFLAGS_COMPILE = "-I${aacenc}/include -L${aacenc}/lib";
-    buildInputs = attrs.buildInputs ++ [ pulseaudio aacenc ];
+    buildInputs = attrs.buildInputs ++ [ libpulseaudio aacenc ];
   });
 
   script = let
-- 
cgit 1.4.1