From d69f3a2a43a0ccfc16771e83236442fdb62a53ed Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 9 May 2018 20:21:55 +0200
Subject: pulseaudio: 11.1 → 12.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

GConf was finally removed in favour of GSettings.

Removes patches that were upstreamed and caps-fix.patch, which is
not needed since f1d465f429252d7c58a920ad9d7ee93e34e7fad9.
---
 pkgs/servers/pulseaudio/caps-fix.patch | 13 -------------
 pkgs/servers/pulseaudio/default.nix    | 34 +++++++++++++---------------------
 2 files changed, 13 insertions(+), 34 deletions(-)
 delete mode 100644 pkgs/servers/pulseaudio/caps-fix.patch

(limited to 'pkgs/servers/pulseaudio')

diff --git a/pkgs/servers/pulseaudio/caps-fix.patch b/pkgs/servers/pulseaudio/caps-fix.patch
deleted file mode 100644
index 1d69a16982f9..000000000000
--- a/pkgs/servers/pulseaudio/caps-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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], [], [
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index ed4a8889c67d..37a104b8b6d8 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -1,9 +1,9 @@
-{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, intltool, autoreconfHook
-, libsndfile, libtool
-, xorg, libcap, alsaLib, glib
+{ lib, stdenv, fetchurl, pkgconfig, intltool, autoreconfHook
+, libsndfile, libtool, makeWrapper
+, xorg, libcap, alsaLib, glib, gnome3
 , avahi, libjack2, libasyncns, lirc, dbus
 , sbc, bluez5, udev, openssl, fftwFloat
-, speexdsp, systemd, webrtc-audio-processing, gconf ? null
+, speexdsp, systemd, webrtc-audio-processing
 
 # Database selection
 , tdb ? null, gdbm ? null
@@ -20,8 +20,6 @@
 
 , airtunesSupport ? false
 
-, gconfSupport ? false
-
 , bluetoothSupport ? false
 
 , remoteControlSupport ? false
@@ -36,27 +34,16 @@
 
 stdenv.mkDerivation rec {
   name = "${if libOnly then "lib" else ""}pulseaudio-${version}";
-  version = "11.1";
+  version = "12.2";
 
   src = fetchurl {
     url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${version}.tar.xz";
-    sha256 = "17ndr6kc7hpv4ih4gygwlcpviqifbkvnk4fbwf4n25kpb991qlpj";
+    sha256 = "0ma0p8iry7fil7qb4pm2nx2pm65kq9hk9xc4r5wkf14nqbzni5l0";
   };
 
-  patches = [ ./caps-fix.patch (fetchpatch {
-    name = "glibc-2.27.patch";
-    url = "https://cgit.freedesktop.org/pulseaudio/pulseaudio/patch/?id=dfb0460fb4743aec047cdf755a660a9ac2d0f3fb";
-    sha256 = "1bi6rbfdjyl6wn0jql4k18xa4hm5l2lpf1sc5j77f8l6jw956afv";
-  }) ]
-    ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
-      name = "padsp-fix.patch";
-      url = "https://git.alpinelinux.org/cgit/aports/plain/testing/pulseaudio/0001-padsp-Make-it-compile-on-musl.patch?id=167be02bf4618a90328e2b234f6a63a5dc05f244";
-      sha256 = "0gf4w25zi123ghk0njapysvrlljkc3hyanacgiswfnnm1i8sab1q";
-    });
-
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig intltool autoreconfHook ];
+  nativeBuildInputs = [ pkgconfig intltool autoreconfHook makeWrapper ];
 
   propagatedBuildInputs =
     lib.optionals stdenv.isLinux [ libcap ];
@@ -72,7 +59,6 @@ stdenv.mkDerivation rec {
       ++ lib.optional useSystemd systemd
       ++ lib.optionals stdenv.isLinux [ alsaLib udev ]
       ++ lib.optional airtunesSupport openssl
-      ++ lib.optional gconfSupport gconf
       ++ lib.optionals bluetoothSupport [ bluez5 sbc ]
       ++ lib.optional remoteControlSupport lirc
       ++ lib.optional zeroconfSupport  avahi
@@ -128,6 +114,12 @@ stdenv.mkDerivation rec {
   ''
     + ''moveToOutput lib/cmake "$dev" '';
 
+  preFixup = lib.optionalString stdenv.isLinux ''
+    wrapProgram $out/libexec/pulse/gsettings-helper \
+     --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/${name}" \
+     --prefix GIO_EXTRA_MODULES : "${lib.getLib gnome3.dconf}/lib/gio/modules"
+  '';
+
   meta = {
     description = "Sound server for POSIX and Win32 systems";
     homepage    = http://www.pulseaudio.org/;
-- 
cgit 1.4.1