diff options
| author | Bobby Rong <rjl931189261@126.com> | 2022-01-13 11:53:32 +0800 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2022-01-13 18:36:54 +0800 |
| commit | bb56f4b4e88ff115f4b1eb8140e1d96aaaefee77 (patch) | |
| tree | f6552c967245445db673490b8a03582849f64aec | |
| parent | 20b0f5fada4d70a9ef67c02d2f9a34441d0ebd01 (diff) | |
| download | nixpkgs-bb56f4b4e88ff115f4b1eb8140e1d96aaaefee77.tar nixpkgs-bb56f4b4e88ff115f4b1eb8140e1d96aaaefee77.tar.gz nixpkgs-bb56f4b4e88ff115f4b1eb8140e1d96aaaefee77.tar.bz2 nixpkgs-bb56f4b4e88ff115f4b1eb8140e1d96aaaefee77.tar.lz nixpkgs-bb56f4b4e88ff115f4b1eb8140e1d96aaaefee77.tar.xz nixpkgs-bb56f4b4e88ff115f4b1eb8140e1d96aaaefee77.tar.zst nixpkgs-bb56f4b4e88ff115f4b1eb8140e1d96aaaefee77.zip | |
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
| -rw-r--r-- | pkgs/desktops/pantheon/apps/elementary-terminal/default.nix | 10 |
1 files changed, 10 insertions, 0 deletions
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 |