diff options
| author | Bobby Rong <rjl931189261@126.com> | 2022-01-13 11:50:45 +0800 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2022-01-13 18:36:49 +0800 |
| commit | 20b0f5fada4d70a9ef67c02d2f9a34441d0ebd01 (patch) | |
| tree | 383f3cdf8c199ece9a75822d9713d994d33a331f /pkgs/desktops/pantheon/apps | |
| parent | 84d4523405486ae3e1cdb3c5ce61baf009fe79bd (diff) | |
| download | nixpkgs-20b0f5fada4d70a9ef67c02d2f9a34441d0ebd01.tar nixpkgs-20b0f5fada4d70a9ef67c02d2f9a34441d0ebd01.tar.gz nixpkgs-20b0f5fada4d70a9ef67c02d2f9a34441d0ebd01.tar.bz2 nixpkgs-20b0f5fada4d70a9ef67c02d2f9a34441d0ebd01.tar.lz nixpkgs-20b0f5fada4d70a9ef67c02d2f9a34441d0ebd01.tar.xz nixpkgs-20b0f5fada4d70a9ef67c02d2f9a34441d0ebd01.tar.zst nixpkgs-20b0f5fada4d70a9ef67c02d2f9a34441d0ebd01.zip | |
pantheon.elementary-mail: 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
Diffstat (limited to 'pkgs/desktops/pantheon/apps')
| -rw-r--r-- | pkgs/desktops/pantheon/apps/elementary-mail/default.nix | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix index 90058633e90..58be49ab4be 100644 --- a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-mail/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-wOu9jvvwG53vzcNa38nk4eREZWW7Cin8el4qApQ8gI8="; }; + patches = [ + # Fix build with meson 0.61 + # https://github.com/elementary/mail/pull/751 + (fetchpatch { + url = "https://github.com/elementary/mail/commit/bbadc56529276d8e0ff98e9df7d9bb1bf8fc5783.patch"; + sha256 = "sha256-lJEnX5/G6e8PdKy1XGlwFIoCeSy6SR5p68tS4noj+44="; + }) + ]; + nativeBuildInputs = [ appstream desktop-file-utils |