diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2022-09-23 20:43:35 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2022-09-23 20:44:04 +0200 |
| commit | af50f69b0a830f6907e1d4a78835db9cd4088c70 (patch) | |
| tree | 47a509f1cdbe17f509c327f9c2d74c4f323d1632 | |
| parent | fixup! libgnomekbd: 3.28.0 → 3.28.1 (diff) | |
| download | nixpkgs-af50f69b0a830f6907e1d4a78835db9cd4088c70.tar.gz | |
gnome.geary: fix libsoup2 × libsoup3 conflict
| -rw-r--r-- | pkgs/desktops/gnome/misc/geary/default.nix | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome/misc/geary/default.nix b/pkgs/desktops/gnome/misc/geary/default.nix index db79db65cb1f..0398ecf36222 100644 --- a/pkgs/desktops/gnome/misc/geary/default.nix +++ b/pkgs/desktops/gnome/misc/geary/default.nix @@ -26,7 +26,7 @@ , itstool , libgee , gnome -, webkitgtk +, webkitgtk_4_1 , python3 , gnutls , cacert @@ -68,6 +68,21 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/geary/-/commit/0f75e7a84a39492d0748cec2ba6028e08cae3644.patch"; sha256 = "sha256-1ADQqKm3DxtjDGPSThq3c7s5S+q/3u/qr9JQEsLaFMI="; }) + + # Remove libsoup2 dependency. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/geary/-/commit/1c1912d0061bb59525b870767d08b16c09acc8da.patch"; + sha256 = "TIL7scp4LGAKJ3kmWEHHwIABQTHpOFSmtPom4MkMKtk="; + }) + + # Prevent libsoup2 × libsoup3 conflict. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/geary/-/commit/796845aaa7148076132af0ff074e9218d0c3f8b8.patch"; + sha256 = "6ZLa8A75RpsXEVMb9bNUiXJSnOvBI1EOok4xzt5m9HU="; + excludes = [ + "org.gnome.Geary.json" + ]; + }) ]; nativeBuildInputs = [ @@ -108,7 +123,7 @@ stdenv.mkDerivation rec { libstemmer libytnef sqlite - webkitgtk + webkitgtk_4_1 ]; checkInputs = [ |