From 099bc11d386cd66cd373acad45fe7355003a8e13 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Fri, 8 May 2020 18:24:41 +0200 Subject: dino: allow newer versions of libsignal-protocol-c The exact version of libsignal-protocol-c used by dino is hard-coded to 2.3.2 because "libsignal-protocol-c has a history of breaking compatibility on the patch level". This prevents libsignal-protocol-c from being updated in https://github.com/NixOS/nixpkgs/pull/83736. Upstream already allows newer versions in the latest git master, so patch the source with this commit. Unfortunately patching doesn't work with git submodules but since the submodule is not used anyways, simply ignore this part of the patch. --- .../networking/instant-messengers/dino/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'pkgs') diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 035878b8e0082..9c286d0083209 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -4,6 +4,7 @@ , xorg, libXdmcp, libxkbcommon , libnotify, libsoup, libgee , librsvg, libsignal-protocol-c +, fetchpatch , libgcrypt , epoxy , at-spi2-core @@ -26,6 +27,15 @@ stdenv.mkDerivation rec { sha256 = "1k5cgj5n8s40i71wqdh6m1q0njl45ichfdbbywx9rga5hljz1c54"; }; + patches = [ + (fetchpatch { + # Allow newer versions of libsignal-protocol-c + url = "https://github.com/dino/dino/commit/fbd70ceaac5ebbddfa21a580c61165bf5b861303.patch"; + sha256 = "0ydpwsmwrzfsry89fsffkfalhki4n1dw99ixjvpiingdrhjmwyl2"; + excludes = [ "plugins/signal-protocol/libsignal-protocol-c" ]; + }) + ]; + nativeBuildInputs = [ vala cmake -- cgit 1.4.1