dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

deltachat-desktop: 1.44.1 -> 1.46.1

Browse Source 
Diff: https://github.com/deltachat/deltachat-desktop/compare/v1.44.1...v1.46.1

Changelog: https://github.com/deltachat/deltachat-desktop/blob/v1.46.1/CHANGELOG.md
This commit is contained in:
Robert Schütz 2024-06-18 02:34:46 -07:00
parent b5b4eec6d1
commit 4ee62639cd
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
View File

@ -1,11 +1,12 @@
{ lib { lib
, buildNpmPackage , buildNpmPackage
, copyDesktopItems , copyDesktopItems
, electron_28 , electron
, buildGoModule , buildGoModule
, esbuild , esbuild
, fetchFromGitHub , fetchFromGitHub
, jq , jq
, deltachat-rpc-server
, libdeltachat , libdeltachat
, makeDesktopItem , makeDesktopItem
, makeWrapper , makeWrapper
@ -36,16 +37,16 @@ let
in in
buildNpmPackage rec { buildNpmPackage rec {
pname = "deltachat-desktop"; pname = "deltachat-desktop";
version = "1.44.1"; version = "1.46.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "deltachat"; owner = "deltachat";
repo = "deltachat-desktop"; repo = "deltachat-desktop";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-fL+9oPQ5dAgvQREZ7A+hKo2MnZKeVvadQDvDPsDNbnQ="; hash = "sha256-90/Wmh0h75i3kvqj3Wo+A3KlKW8LLDWfPza2gDrDY6E=";
}; };
npmDepsHash = "sha256-rUxJLDsAfp+brecTThYTdHIVIfVkKwZ/W5sHV0hHHIk="; npmDepsHash = "sha256-UzWxMd+DYH5A8Zo1rzi8oIsoKbmzsVbGpr3uWtc02rY=";
postPatch = '' postPatch = ''
test \ test \
@ -64,6 +65,7 @@ buildNpmPackage rec {
]; ];
buildInputs = [ buildInputs = [
deltachat-rpc-server
libdeltachat libdeltachat
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
CoreServices CoreServices
@ -77,7 +79,8 @@ buildNpmPackage rec {
}; };
preBuild = '' 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"; npmBuildScript = "build4production";
@ -93,6 +96,9 @@ buildNpmPackage rec {
awk '!/^#/ && NF' build/packageignore_list \ awk '!/^#/ && NF' build/packageignore_list \
| xargs -I {} sh -c "rm -rf $out/lib/node_modules/deltachat-desktop/{}" || true | 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 \ install -D build/icon.png \
$out/share/icons/hicolor/scalable/apps/deltachat.png $out/share/icons/hicolor/scalable/apps/deltachat.png
@ -103,7 +109,7 @@ buildNpmPackage rec {
$out/lib/node_modules/deltachat-desktop/html-dist/fonts $out/lib/node_modules/deltachat-desktop/html-dist/fonts
done 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} \ --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher${stdenv.hostPlatform.extensions.sharedLibrary} \
--add-flags $out/lib/node_modules/deltachat-desktop --add-flags $out/lib/node_modules/deltachat-desktop

1
pkgs/top-level/all-packages.nix
View File

@ -3640,6 +3640,7 @@ with pkgs;
dell-command-configure = callPackage ../tools/system/dell-command-configure { }; dell-command-configure = callPackage ../tools/system/dell-command-configure { };
deltachat-desktop = callPackage ../applications/networking/instant-messengers/deltachat-desktop { deltachat-desktop = callPackage ../applications/networking/instant-messengers/deltachat-desktop {
electron = electron_30;
inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin.apple_sdk.frameworks) CoreServices;
}; };