From 4949d5ec4a34eee070daa4b28cd3d22343f708e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 27 Apr 2015 13:45:07 +0200 Subject: [PATCH] pulseaudio: fixup -lcap with multiple-output changes --- pkgs/servers/pulseaudio/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index b031b0b4508..78e18b6cef9 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -29,7 +29,8 @@ let hasXlibs = xlibs != null; - optLibcap = shouldUsePkg libcap; + optLibcap = shouldUsePkg libcap.out; + optLibcapDev = shouldUsePkg libcap.dev; hasCaps = optLibcap != null || stdenv.isFreeBSD; # Built-in on FreeBSD optOss = if libOnly then null else shouldUsePkg oss; @@ -81,7 +82,7 @@ stdenv.mkDerivation rec { buildInputs = [ 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 optOpenssl optFftw optSpeexdsp optSystemd optWebrtc-audio-processing ] ++ stdenv.lib.optionals hasXlibs (with xlibs; [