From 749258f858b99ef07092daaf3e092109d5dfdf17 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 15 Mar 2022 21:15:57 +0800 Subject: [PATCH] gnome.gnome-notes: fix build with meson 0.61 --- pkgs/desktops/gnome/apps/gnome-notes/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/apps/gnome-notes/default.nix b/pkgs/desktops/gnome/apps/gnome-notes/default.nix index 6af206069e29..0ecd1e2ef6fd 100644 --- a/pkgs/desktops/gnome/apps/gnome-notes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-notes/default.nix @@ -1,8 +1,10 @@ -{ lib, stdenv +{ stdenv +, lib , meson , ninja , gettext , fetchurl +, fetchpatch , pkg-config , wrapGAppsHook , itstool @@ -32,6 +34,15 @@ stdenv.mkDerivation rec { sha256 = "1gvvb2klkzbmyzwkjgmscdiqcl8lyz9b0rxb4igjz079csq6z805"; }; + patches = [ + # Fix build with meson 0.61 + # data/appdata/meson.build:3:5: ERROR: Function does not take positional arguments. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-notes/-/commit/994af76ce5144062d55d141129bf6bf5fab002ee.patch"; + sha256 = "sha256-z7dPOLZzaqvdqUIDy6+V3dKossRbG0EDjBu2oJCF6b4="; + }) + ]; + doCheck = true; postPatch = ''