public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pulseaudio: Remove default derivation

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/kde-apps-15.04/default.nix
View File

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

2
pkgs/desktops/plasma-5.3/default.nix
View File

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

2
pkgs/games/steam/chrootenv.nix
View File

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

2
pkgs/misc/emulators/wine/staging.nix
View File

@ -15,7 +15,7 @@ let v = (import ./versions.nix).staging;
in assert (builtins.parseDrvName wine.name).version == version; in assert (builtins.parseDrvName wine.name).version == version;
stdenv.lib.overrideDerivation wine (self: { 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; buildInputs = build-inputs [ "perl" "utillinux" "autoconf" ] self.buildInputs;
name = "${self.name}-staging"; name = "${self.name}-staging";

4
pkgs/top-level/all-packages.nix
View File

@ -8794,7 +8794,9 @@ let
prefix = "lib"; 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 # The following are disabled in the default build, because if this
# functionality is desired, they are only needed in the PulseAudio # functionality is desired, they are only needed in the PulseAudio
# server. # server.