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

pulseaudio: Fix propagation of libcap

This commit is contained in:
William A. Kennington III 2015-04-26 12:09:52 -07:00
parent 52b47982ff
commit 308429c6be
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/servers/pulseaudio/caps-fix.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/configure.ac b/configure.ac
index 3c71472..71b5c3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -620,6 +620,8 @@ AC_ARG_WITH([caps],
if test "x${with_caps}" != "xno"; then
AC_SEARCH_LIBS([cap_init], [cap], [], [])
+ AS_IF([test "x${with_caps}" != "xyes" -a "x${with_caps}" != "x"],
+ LIBS="-L${with_caps}/lib $LIBS")
# Only give an error on hosts that we know could support capabilities
AC_CHECK_HEADERS([sys/capability.h], [], [

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gnum4, libtool { stdenv, fetchurl, pkgconfig, intltool, automake, autoconf, libtool
, json_c, libsndfile, gettext, intltool, check , json_c, libsndfile, gettext, check
# Optional Dependencies # Optional Dependencies
, xlibs ? null, libcap ? null, valgrind ? null, oss ? null, coreaudio ? null , xlibs ? null, libcap ? null, valgrind ? null, oss ? null, coreaudio ? null
@ -75,9 +75,11 @@ stdenv.mkDerivation rec {
sha256 = "1xpnfxa0d8pgf6b4qdgnkcvrvdxbbbjd5ync19h0f5hbp3h401mm"; sha256 = "1xpnfxa0d8pgf6b4qdgnkcvrvdxbbbjd5ync19h0f5hbp3h401mm";
}; };
nativeBuildInputs = [ pkgconfig gnum4 libtool ]; patches = [ ./caps-fix.patch ];
nativeBuildInputs = [ pkgconfig intltool automake autoconf libtool ];
buildInputs = [ buildInputs = [
json_c libsndfile gettext intltool check database json_c libsndfile gettext check database
optLibcap valgrind optOss optCoreaudio optAlsaLib optEsound optGlib optLibcap valgrind optOss optCoreaudio optAlsaLib optEsound optGlib
optGtk3 optGconf optAvahi optLibjack2 optLibasyncns optLirc optDbus optUdev optGtk3 optGconf optAvahi optLibjack2 optLibasyncns optLirc optDbus optUdev
@ -87,6 +89,11 @@ stdenv.mkDerivation rec {
]) ++ stdenv.lib.optionals (optBluez5 != null) [ optBluez5 optSbc ]; ]) ++ stdenv.lib.optionals (optBluez5 != null) [ optBluez5 optSbc ];
preConfigure = '' preConfigure = ''
# Performs and autoreconf
export NOCONFIGURE="yes"
patchShebangs bootstrap.sh
./bootstrap.sh
# Move the udev rules under $(prefix). # Move the udev rules under $(prefix).
sed -i "src/Makefile.in" \ sed -i "src/Makefile.in" \
-e "s|udevrulesdir[[:blank:]]*=.*$|udevrulesdir = $out/lib/udev/rules.d|g" -e "s|udevrulesdir[[:blank:]]*=.*$|udevrulesdir = $out/lib/udev/rules.d|g"
@ -104,7 +111,7 @@ stdenv.mkDerivation rec {
(mkEnable false "atomic-arm-memory-barrier" null) # TODO: Enable on armv8 (mkEnable false "atomic-arm-memory-barrier" null) # TODO: Enable on armv8
(mkEnable false "neon-opt" null) # TODO: Enable on armv8 (mkEnable false "neon-opt" null) # TODO: Enable on armv8
(mkEnable hasXlibs "x11" null) (mkEnable hasXlibs "x11" null)
(mkWith hasCaps "caps" null) (mkWith hasCaps "caps" optLibcap)
(mkEnable true "tests" null) (mkEnable true "tests" null)
(mkEnable false "samplerate" null) # Deprecated (mkEnable false "samplerate" null) # Deprecated
(mkWith true "database" databaseName) (mkWith true "database" databaseName)