From e133ae2ecc4fa598cefd72f9d67d1a6a61b317a3 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 5 Apr 2022 12:24:31 +0800 Subject: [PATCH] gnome-solanum: fix build with meson 0.61 --- pkgs/applications/misc/gnome-solanum/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/applications/misc/gnome-solanum/default.nix b/pkgs/applications/misc/gnome-solanum/default.nix index 8ad1267afa93..e7d2489bdb54 100644 --- a/pkgs/applications/misc/gnome-solanum/default.nix +++ b/pkgs/applications/misc/gnome-solanum/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, fetchpatch , rustPlatform , desktop-file-utils , meson @@ -27,6 +28,15 @@ stdenv.mkDerivation rec { sha256 = "0cga6cz6jfbipzp008rjznkz7844licdc34lk133fcyqil0cg0ap"; }; + patches = [ + # Fix build with meson 0.61, can be removed on next update + # https://gitlab.gnome.org/World/Solanum/-/merge_requests/49 + (fetchpatch { + url = "https://gitlab.gnome.org/World/Solanum/-/commit/e5c5d88f95b0fe4145c9ed346b8ca98a613d7cfe.patch"; + sha256 = "j84P9KzMr0o38u4OD4ZPst+yqw1LCRoa1awT3nelFDI="; + }) + ]; + cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}";