diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2024-06-20 11:41:49 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-20 11:41:49 +0200 |
commit | c4b37b291a51f806dcde9255e72ed8cbe27c8d43 (patch) | |
tree | e5608c6d4741d2f9319b9d6425ca5f24dbfde92d /pkgs/applications/networking | |
parent | 6d83b8edb9ddaedccad8ab2f0b0efccf4ed06e07 (diff) | |
parent | e924ef5224c33919f4b46a5e8d8572328506bec1 (diff) |
Merge pull request #321047 from dotlambda/deltachat-desktop
Diffstat (limited to 'pkgs/applications/networking')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix | 18 |
2 files changed, 17 insertions, 11 deletions
diff --git a/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix index 8e496c6c11012..a8299361d928b 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "deltachat-cursed"; - version = "0.8.0"; + version = "0.9.0"; pyproject = true; @@ -15,17 +15,17 @@ python3.pkgs.buildPythonApplication rec { owner = "adbenitez"; repo = "deltachat-cursed"; rev = "v${version}"; - hash = "sha256-1QNhNPa6ZKn0lGQXs/cmfdSFHscwlYwFC/2DpnMoHvY="; + hash = "sha256-z4JKe5soR4FdIn8hugxtnxQr/9V8m8a7QRzE1liIexc="; }; - nativeBuildInputs = with python3.pythonOnBuildForHost.pkgs; [ + build-system = with python3.pythonOnBuildForHost.pkgs; [ setuptools setuptools-scm ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ appdirs - deltachat + deltachat2 emoji notify-py setuptools # for pkg_resources diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index d53b122068a91..43a18d775f9ee 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -1,11 +1,12 @@ { lib , buildNpmPackage , copyDesktopItems -, electron_28 +, electron , buildGoModule , esbuild , fetchFromGitHub , jq +, deltachat-rpc-server , libdeltachat , makeDesktopItem , makeWrapper @@ -36,16 +37,16 @@ let in buildNpmPackage rec { pname = "deltachat-desktop"; - version = "1.44.1"; + version = "1.46.1"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; rev = "v${version}"; - hash = "sha256-fL+9oPQ5dAgvQREZ7A+hKo2MnZKeVvadQDvDPsDNbnQ="; + hash = "sha256-90/Wmh0h75i3kvqj3Wo+A3KlKW8LLDWfPza2gDrDY6E="; }; - npmDepsHash = "sha256-rUxJLDsAfp+brecTThYTdHIVIfVkKwZ/W5sHV0hHHIk="; + npmDepsHash = "sha256-UzWxMd+DYH5A8Zo1rzi8oIsoKbmzsVbGpr3uWtc02rY="; postPatch = '' test \ @@ -64,6 +65,7 @@ buildNpmPackage rec { ]; buildInputs = [ + deltachat-rpc-server libdeltachat ] ++ lib.optionals stdenv.isDarwin [ CoreServices @@ -77,7 +79,8 @@ buildNpmPackage rec { }; preBuild = '' - rm -r node_modules/deltachat-node/node/prebuilds + rm node_modules/@deltachat/stdio-rpc-server-*/deltachat-rpc-server + ln -s ${lib.getExe deltachat-rpc-server} node_modules/@deltachat/stdio-rpc-server-linux-* ''; npmBuildScript = "build4production"; @@ -93,6 +96,9 @@ buildNpmPackage rec { awk '!/^#/ && NF' build/packageignore_list \ | xargs -I {} sh -c "rm -rf $out/lib/node_modules/deltachat-desktop/{}" || true + # required for electron to import index.js as a module + cp package.json $out/lib/node_modules/deltachat-desktop + install -D build/icon.png \ $out/share/icons/hicolor/scalable/apps/deltachat.png @@ -103,7 +109,7 @@ buildNpmPackage rec { $out/lib/node_modules/deltachat-desktop/html-dist/fonts done - makeWrapper ${lib.getExe electron_28} $out/bin/deltachat \ + makeWrapper ${lib.getExe electron} $out/bin/deltachat \ --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher${stdenv.hostPlatform.extensions.sharedLibrary} \ --add-flags $out/lib/node_modules/deltachat-desktop |