From 14e42ff7f61395bfa8d6a1755a48eb461bcac269 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 23 Mar 2022 18:09:48 +0800 Subject: [PATCH] gnome.gnome-tetravex: fix build with meson 0.61 --- pkgs/desktops/gnome/games/gnome-tetravex/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/desktops/gnome/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome/games/gnome-tetravex/default.nix index 963c7801a07a..6578bf7c0589 100644 --- a/pkgs/desktops/gnome/games/gnome-tetravex/default.nix +++ b/pkgs/desktops/gnome/games/gnome-tetravex/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , pkg-config , gnome , gtk3 @@ -24,6 +25,17 @@ stdenv.mkDerivation rec { sha256 = "06wihvqp2p52zd2dnknsc3rii69qib4a30yp15h558xrg44z3k8z"; }; + patches = [ + # Fix build with meson 0.61 + # data/meson.build:37:0: ERROR: Function does not take positional arguments. + # data/meson.build:59:0: ERROR: Function does not take positional arguments. + # Taken from https://gitlab.gnome.org/GNOME/gnome-tetravex/-/merge_requests/20 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-tetravex/-/commit/80912d06f5e588f6aca966fa516103275e58d94e.patch"; + sha256 = "2+nFw5sJzbInibKaq3J10Ufbl3CnZWlgnUtzRTZ5G0I="; + }) + ]; + nativeBuildInputs = [ wrapGAppsHook itstool