From bcdb2fdee603dd13066f184b0fe6c2b744752428 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 28 Mar 2022 22:52:26 +0800 Subject: [PATCH] mate.mate-backgrounds: fix build with meson 0.61 abstract/meson.build:3:5: ERROR: Function does not take positional arguments. --- pkgs/desktops/mate/mate-backgrounds/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix index 9384d49e2a3d..3076a7170cbf 100644 --- a/pkgs/desktops/mate/mate-backgrounds/default.nix +++ b/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, gettext, mateUpdateScript }: +{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, gettext, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-backgrounds"; @@ -9,6 +9,15 @@ stdenv.mkDerivation rec { sha256 = "0379hngy3ap1r5kmqvmzs9r710k2c9nal2ps3hq765df4ir15j8d"; }; + patches = [ + # Fix build with meson 0.61, can be removed on next update. + # https://github.com/mate-desktop/mate-backgrounds/pull/39 + (fetchpatch { + url = "https://github.com/mate-desktop/mate-backgrounds/commit/0096e237d420e6247a75a1c6940a818e309ac2a7.patch"; + sha256 = "HEF8VWunFO+NCG18fZA7lbE2l8pc6Z3jcD+rSZ1Jsqg="; + }) + ]; + nativeBuildInputs = [ gettext meson