From 0202d6db56d9cb2bedc1541f826e52589f642bf9 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Wed, 29 May 2019 01:25:33 +0200
Subject: [PATCH] libcanberra: add patch to stop crashing on wayland

Without the applied patch libcanberra assumes the display is an X11
display and subsequently crashes on wayland.
---
 pkgs/development/libraries/libcanberra/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix
index 460a58a19a7..6d76c941114 100644
--- a/pkgs/development/libraries/libcanberra/default.nix
+++ b/pkgs/development/libraries/libcanberra/default.nix
@@ -22,12 +22,20 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--disable-oss" ];
 
-  patchFlags = "-p0";
-  patches = stdenv.lib.optional stdenv.isDarwin
+  patches = [
     (fetchpatch {
+      name = "0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch";
+      url = http://git.0pointer.net/libcanberra.git/patch/?id=c0620e432650e81062c1967cc669829dbd29b310;
+      sha256 = "0rc7zwn39yxzxp37qh329g7375r5ywcqcaak8ryd0dgvg8m5hcx9";
+    })
+  ];
+
+  postPatch = (stdenv.lib.optional stdenv.isDarwin) ''
+    patch -p0 < ${fetchpatch {
       url = "https://raw.githubusercontent.com/macports/macports-ports/master/audio/libcanberra/files/patch-configure.diff";
       sha256 = "1f7h7ifpqvbfhqygn1b7klvwi80zmpv3538vbmq7ql7bkf1q8h31";
-    });
+    }}
+  '';
 
   postInstall = ''
     for f in $out/lib/*.la; do