pkgs: reorganize things related to libpulseaudio
This commit is contained in:
parent
0b60cb9310
commit
0712a61ac1
1 changed files with 20 additions and 10 deletions
|
@ -498,12 +498,6 @@ with pkgs;
|
|||
|
||||
aptly = callPackage ../tools/misc/aptly { };
|
||||
|
||||
apulse = callPackage ../misc/apulse { };
|
||||
|
||||
libpressureaudio = callPackage ../misc/apulse/pressureaudio.nix { };
|
||||
|
||||
libcardiacarrest = callPackage ../misc/libcardiacarrest { };
|
||||
|
||||
archivemount = callPackage ../tools/filesystems/archivemount { };
|
||||
|
||||
arandr = callPackage ../tools/X11/arandr { };
|
||||
|
@ -12392,10 +12386,7 @@ with pkgs;
|
|||
|
||||
pshs = callPackage ../servers/http/pshs { };
|
||||
|
||||
libpulseaudio = callPackage ../servers/pulseaudio {
|
||||
libOnly = true;
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa;
|
||||
};
|
||||
# PulseAudio daemons
|
||||
|
||||
# Name is changed to prevent use in packages;
|
||||
# please use libpulseaudio instead.
|
||||
|
@ -12415,6 +12406,25 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa;
|
||||
};
|
||||
|
||||
# libpulse implementations
|
||||
|
||||
libpulseaudio-vanilla = callPackage ../servers/pulseaudio {
|
||||
libOnly = true;
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa;
|
||||
};
|
||||
|
||||
apulse = callPackage ../misc/apulse { };
|
||||
|
||||
libpressureaudio = callPackage ../misc/apulse/pressureaudio.nix {
|
||||
libpulseaudio = libpulseaudio-vanilla; # headers only
|
||||
};
|
||||
|
||||
libcardiacarrest = callPackage ../misc/libcardiacarrest {
|
||||
libpulseaudio = libpulseaudio-vanilla; # meta only
|
||||
};
|
||||
|
||||
libpulseaudio = libpulseaudio-vanilla;
|
||||
|
||||
tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { };
|
||||
|
||||
pies = callPackage ../servers/pies { };
|
||||
|
|
Loading…
Reference in a new issue