From 84d4523405486ae3e1cdb3c5ce61baf009fe79bd Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 13 Jan 2022 11:47:33 +0800 Subject: [PATCH] pantheon.elementary-camera: pull upstream fix for meson 0.61 i18n.merge_file has been ignoring positional arguments for a time and explicitly rejects with error since meson 0.61 --- .../pantheon/apps/elementary-camera/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix index 932b54e82b67..7135795914d9 100644 --- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pkg-config , meson @@ -34,6 +35,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-xIv+mOlZV58XD0Z6Vc2wA1EQUxT5BaQ0zhYc9v+ne1w="; }; + patches = [ + # Fix build with meson 0.61 + # https://github.com/elementary/camera/pull/216 + (fetchpatch { + url = "https://github.com/elementary/camera/commit/ead143b7e3246c5fa9bb37c95d491fb07cea9e04.patch"; + sha256 = "sha256-2zGigUi6DpjJx8SEvAE3Q3jrm7MggOvLc72lAPMPvs4="; + }) + ]; + nativeBuildInputs = [ appstream desktop-file-utils