diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-06-09 12:28:52 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-06-09 12:28:52 +0200 |
| commit | d3afcac771d86e9e3c482a8564513ab1a72b87e5 (patch) | |
| tree | f002f6e54b1d505c7d1ac4fadc648ce6e2bb3b81 /pkgs/servers/pulseaudio | |
| parent | 480cd436fc077c60e86fccd68d5971dc831f5947 (diff) | |
| parent | e596a33dc08b9b7d34aa62c0418218de7469ae7f (diff) | |
| download | nixpkgs-d3afcac771d86e9e3c482a8564513ab1a72b87e5.tar nixpkgs-d3afcac771d86e9e3c482a8564513ab1a72b87e5.tar.gz nixpkgs-d3afcac771d86e9e3c482a8564513ab1a72b87e5.tar.bz2 nixpkgs-d3afcac771d86e9e3c482a8564513ab1a72b87e5.tar.lz nixpkgs-d3afcac771d86e9e3c482a8564513ab1a72b87e5.tar.xz nixpkgs-d3afcac771d86e9e3c482a8564513ab1a72b87e5.tar.zst nixpkgs-d3afcac771d86e9e3c482a8564513ab1a72b87e5.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers/pulseaudio')
| -rw-r--r-- | pkgs/servers/pulseaudio/default.nix | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 0b3d9eb53ad..66db4f32eea 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, autoreconfHook +{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, intltool, autoreconfHook , libsndfile, libtool, makeWrapper , xorg, libcap, alsaLib, glib, gnome3 , avahi, libjack2, libasyncns, lirc, dbus @@ -130,6 +130,19 @@ stdenv.mkDerivation rec { --prefix GIO_EXTRA_MODULES : "${lib.getLib gnome3.dconf}/lib/gio/modules" ''; + patches = [ + (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"; + }) + ]; + meta = { description = "Sound server for POSIX and Win32 systems"; homepage = http://www.pulseaudio.org/; |