From 4f988c3f09d53672c4a392b2b5b29a1ed9660b6b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 25 Mar 2022 10:35:43 +0800 Subject: dfeet: fix build with meson 0.61 --- pkgs/development/tools/misc/d-feet/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'pkgs/development/tools/misc/d-feet') diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index 3db895f4de01f..a394ee6157732 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -1,6 +1,7 @@ { lib , pkg-config , fetchurl +, fetchpatch , meson , ninja , glib @@ -25,6 +26,17 @@ python3.pkgs.buildPythonApplication rec { sha256 = "hzPOS5qaVOwYWx2Fv02p2dEQUogqiAdg/2D5d5stHMs="; }; + patches = [ + # Fix build with meson 0.61 + # data/meson.build:15:0: ERROR: Function does not take positional arguments. + # data/meson.build:27:0: ERROR: Function does not take positional arguments. + # Patch taken from https://gitlab.gnome.org/GNOME/d-feet/-/merge_requests/32 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/d-feet/-/commit/05465d486afdba116dbc22fc22c1e6573aea4f22.patch"; + sha256 = "sFI3nd0YE/deGws/YcTpzC/em9QNgicyb4j7cTfOdhY="; + }) + ]; + nativeBuildInputs = [ gettext gobject-introspection -- cgit 1.4.1