Merge pull request #117047 from collares/gtksourceview4

gtksourceview4: fix intermittent "resource not found" build errors
This commit is contained in:
Jan Tojnar 2021-03-25 14:24:17 +01:00 committed by GitHub
commit 69167a7026
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, atk, cairo, glib, gtk3, pango, fribidi, vala
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, atk, cairo, glib, gtk3, pango, fribidi, vala
, libxml2, perl, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info
, meson, ninja }:
@ -26,7 +26,16 @@ stdenv.mkDerivation rec {
buildInputs = [ atk cairo glib pango fribidi libxml2 ];
patches = [ ./4.x-nix_share_path.patch ];
patches = [
./4.x-nix_share_path.patch
# fixes intermittent "gtksourceview-gresources.h: no such file" errors
(fetchpatch {
name = "ensure-access-to-resources-in-corelib-build.patch";
url = "https://gitlab.gnome.org/GNOME/gtksourceview/-/commit/9bea9d1c4a56310701717bb106c52a5324ee392a.patch";
sha256 = "sha256-rSB6lOFEyz58HfOSj7ZM48/tHxhqbtWWbh60JuySAZ0=";
})
];
enableParallelBuilding = true;