diff options
| author | Robert Schütz <dev@schuetz-co.de> | 2021-08-02 10:59:43 +0200 |
|---|---|---|
| committer | Robert Schütz <dev@schuetz-co.de> | 2021-08-04 08:55:39 +0200 |
| commit | 50438c5874fa314170bd7d1ee90abb911126ca4e (patch) | |
| tree | 0f153b347e8460dd373b6ac4e82439ea79a07455 /pkgs/applications/networking/instant-messengers/kdeltachat | |
| parent | 0576bf5dc90195618e88f7de2ec7fa12ccdec3b1 (diff) | |
kdeltachat: unstable-2021-07-17 -> unstable-2021-08-02
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/kdeltachat')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/kdeltachat/default.nix | 35 |
1 files changed, 30 insertions, 5 deletions
diff --git a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix index ced0c77a96af..3266b36194f4 100644 --- a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix +++ b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix @@ -1,25 +1,44 @@ { lib , mkDerivation +, fetchFromGitHub , fetchFromSourcehut , cmake , extra-cmake-modules , pkg-config , kirigami2 , libdeltachat +, qtbase , qtimageformats , qtmultimedia , qtwebengine +, rustPlatform }: -mkDerivation rec { +let + libdeltachat' = libdeltachat.overrideAttrs (old: rec { + inherit (old) pname; + version = "1.58.0"; + src = fetchFromGitHub { + owner = "deltachat"; + repo = "deltachat-core-rust"; + rev = version; + sha256 = "03xc0jlfmvmdcipmzavbzkq010qlxzf3mj1zi7wcix7kpl8gwmy7"; + }; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + sha256 = "1zijxyc1xjlbyh1gh2lyw44xjcrhz1msykrlqgfkw5w1w0yh78hd"; + }; + }); +in mkDerivation rec { pname = "kdeltachat"; - version = "unstable-2021-07-17"; + version = "unstable-2021-08-02"; src = fetchFromSourcehut { owner = "~link2xt"; repo = "kdeltachat"; - rev = "9e5fe2dc856795d0d3d8b6a3adf3fdd3015d9158"; - sha256 = "12arcrnpacq2fbjbzs6a9yz6lfsj2dkga9chpld1ran3v6by58z9"; + rev = "950f4f22c01ab75f613479ef831bdf38f395d1dd"; + sha256 = "007gazqkzcc0w0rq2i8ysa9f50ldj7n9f5gp1mh8bi86bdvdkzsy"; }; nativeBuildInputs = [ @@ -30,12 +49,18 @@ mkDerivation rec { buildInputs = [ kirigami2 - libdeltachat + libdeltachat' qtimageformats qtmultimedia qtwebengine ]; + # needed for qmlplugindump to work + QT_PLUGIN_PATH = "${qtbase.bin}/${qtbase.qtPluginPrefix}"; + QML2_IMPORT_PATH = lib.concatMapStringsSep ":" + (lib: "${lib}/${qtbase.qtQmlPrefix}") + [ kirigami2 qtmultimedia ]; + meta = with lib; { description = "Delta Chat client using Kirigami framework"; homepage = "https://git.sr.ht/~link2xt/kdeltachat"; |