From bb56f4b4e88ff115f4b1eb8140e1d96aaaefee77 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 13 Jan 2022 11:53:32 +0800 Subject: pantheon.elementary-terminal: 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 --- pkgs/desktops/pantheon/apps/elementary-terminal/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'pkgs/desktops/pantheon/apps/elementary-terminal') diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index 4840f69e7cb..f3402299ff7 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pkg-config , meson @@ -32,6 +33,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-4q7YQ4LxuiM/TRae1cc3ncmw7QwE1soC2Sh+GZ+Gpq0="; }; + patches = [ + # Fix build with meson 0.61 + # https://github.com/elementary/terminal/pull/649 + (fetchpatch { + url = "https://github.com/elementary/terminal/commit/15e3ace08cb25e53941249fa1ee680a1e2f871b4.patch"; + sha256 = "sha256-XVs+kq5qbX5KlxtkqxwJnatNYNeJiVLBec7sLjQsUxg="; + }) + ]; + nativeBuildInputs = [ appstream desktop-file-utils -- cgit 1.4.1