summary refs log tree commit diff
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2015-04-27 13:45:07 +0200
committerVladimír Čunát <vcunat@gmail.com>2015-05-05 11:56:29 +0200
commit4949d5ec4a34eee070daa4b28cd3d22343f708e8 (patch)
tree54cddb2f1226bee5aa681dac1f0a3fbf86ff2023
parentf0746b846c1b89933733f08fd86c89981f359e07 (diff)
downloadnixpkgs-4949d5ec4a34eee070daa4b28cd3d22343f708e8.tar
nixpkgs-4949d5ec4a34eee070daa4b28cd3d22343f708e8.tar.gz
nixpkgs-4949d5ec4a34eee070daa4b28cd3d22343f708e8.tar.bz2
nixpkgs-4949d5ec4a34eee070daa4b28cd3d22343f708e8.tar.lz
nixpkgs-4949d5ec4a34eee070daa4b28cd3d22343f708e8.tar.xz
nixpkgs-4949d5ec4a34eee070daa4b28cd3d22343f708e8.tar.zst
nixpkgs-4949d5ec4a34eee070daa4b28cd3d22343f708e8.zip
pulseaudio: fixup -lcap with multiple-output changes
-rw-r--r--pkgs/servers/pulseaudio/default.nix5
1 files 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; [