diff --git a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix b/pkgs/by-name/kd/kdeltachat/package.nix similarity index 60% rename from pkgs/applications/networking/instant-messengers/kdeltachat/default.nix rename to pkgs/by-name/kd/kdeltachat/package.nix index f84eb379fec8..ff2ab0db040f 100644 --- a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix +++ b/pkgs/by-name/kd/kdeltachat/package.nix @@ -1,19 +1,41 @@ { lib, - mkDerivation, + fetchFromGitHub, fetchFromSourcehut, cmake, extra-cmake-modules, pkg-config, - kirigami2, libdeltachat, - qtbase, - qtimageformats, - qtmultimedia, - qtwebengine, + libsForQt5, + rustPlatform, + stdenv, }: -mkDerivation { +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="; + }; + }; + inherit (libsForQt5) + kirigami2 + qtbase + qtimageformats + qtmultimedia + qtwebengine + wrapQtAppsHook + ; +in +stdenv.mkDerivation { pname = "kdeltachat"; version = "unstable-2024-01-14"; @@ -28,11 +50,12 @@ mkDerivation { cmake extra-cmake-modules pkg-config + wrapQtAppsHook ]; buildInputs = [ kirigami2 - libdeltachat + libdeltachat' qtimageformats qtmultimedia qtwebengine diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d77d139b828d..d8926faa6c77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13016,8 +13016,6 @@ with pkgs; kaidan = kdePackages.callPackage ../applications/networking/instant-messengers/kaidan { }; - kdeltachat = libsForQt5.callPackage ../applications/networking/instant-messengers/kdeltachat { }; - kexi = libsForQt5.callPackage ../applications/office/kexi { }; kgraphviewer = callPackage ../applications/graphics/kgraphviewer { };