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

pulseaudio: fixup -lcap with multiple-output changes

Browse Source
This commit is contained in:
Vladimír Čunát 2015-04-27 13:45:07 +02:00
parent f0746b846c
commit 4949d5ec4a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/servers/pulseaudio/default.nix
View File

@ -29,7 +29,8 @@ let
hasXlibs = xlibs != null; hasXlibs = xlibs != null;
optLibcap = shouldUsePkg libcap; optLibcap = shouldUsePkg libcap.out;
optLibcapDev = shouldUsePkg libcap.dev;
hasCaps = optLibcap != null || stdenv.isFreeBSD; # Built-in on FreeBSD hasCaps = optLibcap != null || stdenv.isFreeBSD; # Built-in on FreeBSD
optOss = if libOnly then null else shouldUsePkg oss; optOss = if libOnly then null else shouldUsePkg oss;
@ -81,7 +82,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
json_c libsndfile gettext check database json_c libsndfile gettext check database
optLibcap valgrind optOss optCoreaudio optAlsaLib optEsound optGlib optLibcap optLibcapDev valgrind optOss optCoreaudio optAlsaLib optEsound optGlib
optGtk3 optGconf optAvahi optLibjack2 optLibasyncns optLirc optDbus optUdev optGtk3 optGconf optAvahi optLibjack2 optLibasyncns optLirc optDbus optUdev
optOpenssl optFftw optSpeexdsp optSystemd optWebrtc-audio-processing optOpenssl optFftw optSpeexdsp optSystemd optWebrtc-audio-processing
] ++ stdenv.lib.optionals hasXlibs (with xlibs; [ ] ++ stdenv.lib.optionals hasXlibs (with xlibs; [