nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-01 09:44:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

pkgs: reorganize things related to libpulseaudio

Browse Source
This commit is contained in:
Jan Malakhovski 2018-02-22 22:09:07 +00:00
parent 0b60cb9310
commit 0712a61ac1
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -498,12 +498,6 @@ with pkgs;
aptly = callPackage ../tools/misc/aptly { }; aptly = callPackage ../tools/misc/aptly { };
apulse = callPackage ../misc/apulse { };
libpressureaudio = callPackage ../misc/apulse/pressureaudio.nix { };
libcardiacarrest = callPackage ../misc/libcardiacarrest { };
archivemount = callPackage ../tools/filesystems/archivemount { }; archivemount = callPackage ../tools/filesystems/archivemount { };
arandr = callPackage ../tools/X11/arandr { }; arandr = callPackage ../tools/X11/arandr { };
@ -12392,10 +12386,7 @@ with pkgs;
pshs = callPackage ../servers/http/pshs { }; pshs = callPackage ../servers/http/pshs { };
libpulseaudio = callPackage ../servers/pulseaudio { # PulseAudio daemons
libOnly = true;
inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa;
};
# Name is changed to prevent use in packages; # Name is changed to prevent use in packages;
# please use libpulseaudio instead. # please use libpulseaudio instead.
@ -12415,6 +12406,25 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; 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 { }; tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { };
pies = callPackage ../servers/pies { }; pies = callPackage ../servers/pies { };