From dfde395b2af558cdad66aaa4b8439e03026873be Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 5 Aug 2023 18:53:45 +0800 Subject: [PATCH] cinnamon.xreader: Backport meson 1.2 fix Because meson 1.2 is already in staging. --- pkgs/desktops/cinnamon/xreader/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/desktops/cinnamon/xreader/default.nix b/pkgs/desktops/cinnamon/xreader/default.nix index d6bf6c1faaae..1da859b3cd17 100644 --- a/pkgs/desktops/cinnamon/xreader/default.nix +++ b/pkgs/desktops/cinnamon/xreader/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , glib , gobject-introspection , intltool @@ -35,6 +36,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-2zqlfoN4L+V237cQ3PVh49YaZfNKGiLqh2JIiGJE340="; }; + patches = [ + # Fix build with meson 1.2, can be dropped on next bump + # https://github.com/linuxmint/xreader/issues/612 + (fetchpatch { + url = "https://github.com/linuxmint/xreader/commit/06b18a884c8cf3257ea1f053a82784da078999ed.patch"; + sha256 = "sha256-+LXEW3OkfhkIcbxtvfQYjdaC18O8imOx22t91ad/XZw="; + }) + ]; + nativeBuildInputs = [ shared-mime-info wrapGAppsHook