Merge pull request #165564 from bobby285271/gnome-notes

gnome.gnome-notes: fix build with meson 0.61
This commit is contained in:
Bobby Rong 2022-03-24 16:11:56 +08:00 committed by GitHub
commit b9a73c7402
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,8 +1,10 @@
{ lib, stdenv { stdenv
, lib
, meson , meson
, ninja , ninja
, gettext , gettext
, fetchurl , fetchurl
, fetchpatch
, pkg-config , pkg-config
, wrapGAppsHook , wrapGAppsHook
, itstool , itstool
@ -32,6 +34,15 @@ stdenv.mkDerivation rec {
sha256 = "1gvvb2klkzbmyzwkjgmscdiqcl8lyz9b0rxb4igjz079csq6z805"; 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; doCheck = true;
postPatch = '' postPatch = ''