diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-06-10 11:15:40 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-06-10 11:15:40 +0200 |
| commit | 3fb275d1664899cf3ba19b74f73f0c27407b521b (patch) | |
| tree | de3ebeb1bde792dc86fa2cab72fe413c590bb278 /pkgs/servers/pulseaudio | |
| parent | e58f0f6c997ab6e1b62f30aea5d9c1fb8ec628ad (diff) | |
| download | nixpkgs-3fb275d1664899cf3ba19b74f73f0c27407b521b.tar nixpkgs-3fb275d1664899cf3ba19b74f73f0c27407b521b.tar.gz nixpkgs-3fb275d1664899cf3ba19b74f73f0c27407b521b.tar.bz2 nixpkgs-3fb275d1664899cf3ba19b74f73f0c27407b521b.tar.lz nixpkgs-3fb275d1664899cf3ba19b74f73f0c27407b521b.tar.xz nixpkgs-3fb275d1664899cf3ba19b74f73f0c27407b521b.tar.zst nixpkgs-3fb275d1664899cf3ba19b74f73f0c27407b521b.zip | |
pulseaudio: fix build and eval
Diffstat (limited to 'pkgs/servers/pulseaudio')
| -rw-r--r-- | pkgs/servers/pulseaudio/default.nix | 42 |
1 files changed, 15 insertions, 27 deletions
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 66db4f32eea..13b5d4c3c9f 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -4,7 +4,6 @@ , avahi, libjack2, libasyncns, lirc, dbus , sbc, bluez5, udev, openssl, fftwFloat , speexdsp, systemd, webrtc-audio-processing -, fetchpatch , x11Support ? false @@ -60,19 +59,21 @@ stdenv.mkDerivation rec { ++ lib.optionals bluetoothSupport [ bluez5 sbc ] ++ lib.optional remoteControlSupport lirc ++ lib.optional zeroconfSupport avahi - ); - - patches = [ - # The following two patches fix alsalib headers move, remove after the next release - (fetchpatch { - url = "https://gitlab.freedesktop.org/pulseaudio/pulseaudio/commit/993d3fd89e5611997f1e165bf03edefb0204b0a4.patch"; - sha256 = "17icnf8026947j1dqw4k16f91vy6zyg7q41zv2j6pxh9fncb1s71"; - }) - (fetchpatch { - url = "https://gitlab.freedesktop.org/pulseaudio/pulseaudio/commit/b89d33bb182c42db5ad3987b0e91b7bf62f421e8.patch"; - sha256 = "0jccpc0dgkb0v4xrkyca2pm2k4i6pvahs9bq4hbg34173p23g5nb"; - }) - ]; + ); + + patches = [ + # The following two patches fix alsalib headers move, remove after the next release + (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 @@ -130,19 +131,6 @@ 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/; |