diff options
| author | Bobby Rong <rjl931189261@126.com> | 2023-05-01 15:58:55 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-01 15:58:55 +0800 |
| commit | 82cea11923906492263ea968ccd986a01238b5d9 (patch) | |
| tree | 76db4a39e7982433fd5f3b2bb4afbd43fd971253 | |
| parent | 7e5a4795a71aa7ba5d07e48621df7e8bef56db0a (diff) | |
| download | nixpkgs-82cea11923906492263ea968ccd986a01238b5d9.tar nixpkgs-82cea11923906492263ea968ccd986a01238b5d9.tar.gz nixpkgs-82cea11923906492263ea968ccd986a01238b5d9.tar.bz2 nixpkgs-82cea11923906492263ea968ccd986a01238b5d9.tar.lz nixpkgs-82cea11923906492263ea968ccd986a01238b5d9.tar.xz nixpkgs-82cea11923906492263ea968ccd986a01238b5d9.tar.zst nixpkgs-82cea11923906492263ea968ccd986a01238b5d9.zip | |
gnome.geary: Fix build with Vala 0.56.7 & 0.57+
| -rw-r--r-- | pkgs/desktops/gnome/misc/geary/default.nix | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/desktops/gnome/misc/geary/default.nix b/pkgs/desktops/gnome/misc/geary/default.nix index e2b33343061..37a5cf2cace 100644 --- a/pkgs/desktops/gnome/misc/geary/default.nix +++ b/pkgs/desktops/gnome/misc/geary/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch2 , pkg-config , gtk3 , vala @@ -54,6 +55,19 @@ stdenv.mkDerivation rec { sha256 = "SJFm+H3Z0pAR9eW3lpTyWItHP34ZHFnOkBPIyODjY+c="; }; + patches = [ + # Fix build with Vala 0.56.7 & 0.57+ + # https://hydra.nixos.org/build/217892787 + (fetchpatch2 { + url = "https://gitlab.gnome.org/GNOME/geary/-/commit/4a7ca820b1d3d6130fedf254dc5b4cd7efb58f2c.patch"; + sha256 = "L63TMOkxTYu8jxX+IIc9owoa1TBmaeGXgW+8gfMtFw4="; + }) + (fetchpatch2 { + url = "https://gitlab.gnome.org/GNOME/geary/-/commit/10f9c133a2ad515127d65f3bba13a0d91b75f4af.patch"; + sha256 = "0yohy+FZyHW4MkImLQYNlcZyMekH7mXvO2yEuAm3fXw="; + }) + ]; + nativeBuildInputs = [ appstream-glib desktop-file-utils |