From f7f7b759efd0cb37f4a121c6570f562a3496c27b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 1 Dec 2019 15:33:04 +0100 Subject: [PATCH] gnome-builder: fix build with Meson 0.52 --- pkgs/applications/editors/gnome-builder/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 6ac2c6d4964c..bda0552e7529 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -5,6 +5,7 @@ , docbook_xsl , docbook_xml_dtd_43 , fetchurl +, fetchpatch , flatpak , gnome3 , libgit2-glib @@ -45,6 +46,18 @@ stdenv.mkDerivation rec { sha256 = "19018pq94cxf6fywd7fsmy98x56by5zfmh140pl530gaaw84cvhb"; }; + patches = [ + # Fix build with Meson 0.52 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-builder/commit/c8b862b491cfbbb4f79b24d7cd90e4fb1f37cb9f.patch"; + sha256 = "0n8kg7nnjqmbnyag1ps6dvrlqrxc94djjncqx10d6y7ijwdxf4w8"; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-builder/commit/da26dfbf78468f5ed724e022b300a07862a95833.patch"; + sha256 = "0psa65bzjpjj7vc5rknv2w2dz3p50jjv10s6j2fd6lpw8j2800k4"; + }) + ]; + nativeBuildInputs = [ appstream-glib desktop-file-utils