Merge pull request #62184 from andir/libcanberra-wayland

libcanberra: add patch to stop crashing on wayland
This commit is contained in:
worldofpeace 2019-05-29 23:18:55 -04:00 committed by GitHub
commit d07364d651
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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