diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2015-05-30 14:27:47 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2015-05-30 14:31:24 +0200 |
| commit | dd75ac4355c185b6e4db33651aadc4c3669ad2c7 (patch) | |
| tree | fd767d0ead0c061ea4ace9616d972645f86c0e2c /pkgs | |
| parent | f55c21699ea4366b84da113750ba8a41910b5893 (diff) | |
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>
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/pvolctrl/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/sidplayfp/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/twitchstream/default.nix | 6 |
3 files changed, 7 insertions, 7 deletions
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 |