From 6911f1ef788f6f3b5e4ecac827f6f42914cca557 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 7 Apr 2022 17:03:37 +0800 Subject: [PATCH] drawing: fix build with meson 0.61 --- pkgs/applications/graphics/drawing/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/applications/graphics/drawing/default.nix b/pkgs/applications/graphics/drawing/default.nix index 40c651ac2570..cd92a0d39ec7 100644 --- a/pkgs/applications/graphics/drawing/default.nix +++ b/pkgs/applications/graphics/drawing/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , meson , ninja , pkg-config @@ -29,6 +30,16 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-qNaljtuA5E/QaLJ9QILPRQCqOvKmX4ZGq/0z5unA8KA="; }; + patches = [ + # Fix build with meson 0.61, can be removed on next update. + # https://github.com/NixOS/nixpkgs/issues/167584 + (fetchpatch { + url = "https://github.com/maoschanz/drawing/commit/6dd271089af76b69322500778e3ad6615a117dcc.patch"; + sha256 = "sha256-4pKWm3LYstVxZ4+gGsZDfM4K+7WBY8EYjylzc/CQZmo="; + includes = [ "data/meson.build" "help/meson.build" ]; + }) + ]; + nativeBuildInputs = [ appstream-glib desktop-file-utils