From 6d6e907dbc4618f5fff2d9c746710aebdb78ff4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 13 May 2025 17:55:43 -0700 Subject: [PATCH] kdeltachat: pin libdeltachat at 1.155.6 Otherwise kdeltachat fails to build with /build/source/message.cpp: In member function 'void DcMessage::setFile(QString)': /build/source/message.cpp:93:12: error: 'dc_msg_set_file' was not declared in this scope; did you mean 'dc_msg_get_file'? 93 | return dc_msg_set_file(m_message, utf8File.constData(), NULL); | ^~~~~~~~~~~~~~~ | dc_msg_get_file --- .../instant-messengers/kdeltachat/default.nix | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix index f84eb379fec8..6584d64e94ba 100644 --- a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix +++ b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix @@ -1,6 +1,7 @@ { lib, mkDerivation, + fetchFromGitHub, fetchFromSourcehut, cmake, extra-cmake-modules, @@ -11,8 +12,25 @@ qtimageformats, qtmultimedia, qtwebengine, + rustPlatform, }: +let + libdeltachat' = libdeltachat.overrideAttrs rec { + version = "1.155.6"; + src = fetchFromGitHub { + owner = "chatmail"; + repo = "core"; + tag = "v${version}"; + hash = "sha256-d7EmmyLSJjFIZM1j6LP8f4WnXiptNTAqOdJD/oPL02Y="; + }; + cargoDeps = rustPlatform.fetchCargoVendor { + pname = "deltachat-core-rust"; + inherit version src; + hash = "sha256-E01aEzNi06LQntrlA+342a8Nl5API6v7HbdmuKpfajs="; + }; + }; +in mkDerivation { pname = "kdeltachat"; version = "unstable-2024-01-14"; @@ -32,7 +50,7 @@ mkDerivation { buildInputs = [ kirigami2 - libdeltachat + libdeltachat' qtimageformats qtmultimedia qtwebengine