Merge pull request #122154 from jnetod/zhf-xneur

xneur: fix build with gcc10
This commit is contained in:
Michael Raskin 2021-05-08 15:01:36 +00:00 committed by GitHub
commit 1dff38cae5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, intltool, xorg, pcre, gst_all_1, glib
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, intltool, xorg, pcre, gst_all_1, glib
, xosd, libnotify, enchant, wrapGAppsHook, gdk-pixbuf }:
stdenv.mkDerivation {
@ -21,6 +21,14 @@ stdenv.mkDerivation {
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
];
patches = [
(fetchpatch {
name = "gcc-10.patch";
url = "https://salsa.debian.org/debian/xneur/-/raw/da38ad9c8e1bf4e349f5ed4ad909f810fdea44c9/debian/patches/gcc-10.patch";
sha256 = "0pc17a4sdrnrc4z7gz28889b9ywqsm5mzm6m41h67j2f5zh9k3fy";
})
];
postPatch = ''
sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure
'';