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

pulseaudio: 12.2 -> 13.0

Browse Source 
https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/13.0/
This commit is contained in:
Will Dietz 2019-09-13 11:20:36 -05:00 committed by worldofpeace
parent d3f474e8d0
commit 5d49ee3e5d
1 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, intltool, autoreconfHook { lib, stdenv, fetchurl, pkgconfig, autoreconfHook
, libsndfile, libtool, makeWrapper , libsndfile, libtool, makeWrapper, perlPackages
, xorg, libcap, alsaLib, glib, gnome3 , xorg, libcap, alsaLib, glib, gnome3
, avahi, libjack2, libasyncns, lirc, dbus , avahi, libjack2, libasyncns, lirc, dbus
, sbc, bluez5, udev, openssl, fftwFloat , sbc, bluez5, udev, openssl, fftwFloat
@ -31,16 +31,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${if libOnly then "lib" else ""}pulseaudio-${version}"; name = "${if libOnly then "lib" else ""}pulseaudio-${version}";
version = "12.2"; version = "13.0";
src = fetchurl { src = fetchurl {
url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${version}.tar.xz"; url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${version}.tar.xz";
sha256 = "0ma0p8iry7fil7qb4pm2nx2pm65kq9hk9xc4r5wkf14nqbzni5l0"; sha256 = "0mw0ybrqj7hvf8lqs5gjzip464hfnixw453lr0mqzlng3b5266wn";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkgconfig intltool autoreconfHook makeWrapper ]; nativeBuildInputs = [ pkgconfig autoreconfHook makeWrapper perlPackages.perl perlPackages.XMLParser ];
propagatedBuildInputs = propagatedBuildInputs =
lib.optionals stdenv.isLinux [ libcap ]; lib.optionals stdenv.isLinux [ libcap ];
@ -61,25 +61,10 @@ stdenv.mkDerivation rec {
++ lib.optional zeroconfSupport avahi ++ lib.optional zeroconfSupport avahi
); );
patches = [ autoreconfPhase = ''
# The following two patches fix alsalib headers move, remove after the next release # Performs an autoreconf
(fetchpatch {
name = "alsa-asoundlib-include.patch";
url = "https://gitlab.freedesktop.org/pulseaudio/pulseaudio/commit/993d3fd89e5611997f1e165bf03edefb0204b0a4.patch";
sha256 = "17icnf8026947j1dqw4k16f91vy6zyg7q41zv2j6pxh9fncb1s71";
})
(fetchpatch {
name = "alsa-use-case-include.patch";
url = "https://gitlab.freedesktop.org/pulseaudio/pulseaudio/commit/b89d33bb182c42db5ad3987b0e91b7bf62f421e8.patch";
sha256 = "0jccpc0dgkb0v4xrkyca2pm2k4i6pvahs9bq4hbg34173p23g5nb";
})
];
preConfigure = ''
# Performs and autoreconf
export NOCONFIGURE="yes"
patchShebangs bootstrap.sh patchShebangs bootstrap.sh
./bootstrap.sh NOCONFIGURE=1 ./bootstrap.sh
# Move the udev rules under $(prefix). # Move the udev rules under $(prefix).
sed -i "src/Makefile.in" \ sed -i "src/Makefile.in" \
@ -99,11 +84,11 @@ stdenv.mkDerivation rec {
[ "--localstatedir=/var" [ "--localstatedir=/var"
"--sysconfdir=/etc" "--sysconfdir=/etc"
"--with-access-group=audio" "--with-access-group=audio"
"--with-bash-completion-dir=\${out}/share/bash-completions/completions" "--with-bash-completion-dir=${placeholder "out"}/share/bash-completions/completions"
] ]
++ lib.optional (jackaudioSupport && !libOnly) "--enable-jack" ++ lib.optional (jackaudioSupport && !libOnly) "--enable-jack"
++ lib.optional stdenv.isDarwin "--with-mac-sysroot=/" ++ lib.optional stdenv.isDarwin "--with-mac-sysroot=/"
++ lib.optional (stdenv.isLinux && useSystemd) "--with-systemduserunitdir=\${out}/lib/systemd/user"; ++ lib.optional (stdenv.isLinux && useSystemd) "--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user";
enableParallelBuilding = true; enableParallelBuilding = true;
@ -115,8 +100,8 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I/usr/include"; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I/usr/include";
installFlags = installFlags =
[ "sysconfdir=$(out)/etc" [ "sysconfdir=${placeholder "out"}/etc"
"pulseconfdir=$(out)/etc/pulse" "pulseconfdir=${placeholder "out"}/etc/pulse"
]; ];
postInstall = lib.optionalString libOnly '' postInstall = lib.optionalString libOnly ''