pulseaudio: Remove default derivation

This commit is contained in:
William A. Kennington III 2015-05-29 14:38:53 -07:00
parent b9a366e5c4
commit be5f4082fd
5 changed files with 7 additions and 5 deletions

View file

@ -117,7 +117,7 @@ let
OpenEXR = openexr;
Poppler = poppler_qt4;
Prison = prison;
PulseAudio = pulseaudio;
PulseAudio = libpulseaudio;
PythonLibrary = python;
Qalculate = libqalculate;
QCA2 = qca2;

View file

@ -53,7 +53,7 @@ let
GTK3 = gtk3;
Libinput = libinput;
LibSSH = libssh;
PulseAudio = pulseaudio;
PulseAudio = libpulseaudio;
Taglib = taglib;
USB = libusb;
Wayland = wayland;

View file

@ -56,7 +56,7 @@ buildFHSUserEnv {
pkgs.alsaLib
pkgs.libvorbis
pkgs.openal
pkgs.pulseaudio
pkgs.libpulseaudio
pkgs.flashplayer

View file

@ -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";

View file

@ -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.