mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
Merge pull request #62184 from andir/libcanberra-wayland
libcanberra: add patch to stop crashing on wayland
This commit is contained in:
commit
d07364d651
1 changed files with 11 additions and 3 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue