b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #213307 from dotlambda/deltachat-desktop-electron_22

Browse source 
deltachat-desktop: use electron_22
This commit is contained in:
Weijia Wang 2023-01-29 12:21:19 +01:00 committed by GitHub
parent dc3518d8f3 e713cf56f2
commit 3c20aae1e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
View file

@ -1,7 +1,7 @@
{ lib
, buildNpmPackage
, copyDesktopItems
, electron_18
, electron_22
, buildGoModule
, esbuild
, fetchFromGitHub
@ -57,7 +57,15 @@ in buildNpmPackage rec {
hash = "sha256-XOGfKa0eGVZKKKC0Pm2kw48XWWcrxCyDdYzCSKp+wco=";
};
npmDepsHash = "sha256-ZMXXBDVT5rHTzHOrKAUAezL/1UTMdzbBllG69kxg55M=";
patches = [
(fetchpatch {
name = "bump-electron-to-22.1.0.patch";
url = "https://github.com/deltachat/deltachat-desktop/commit/944d2735cda6cd5a95cb83c57484fbaf16720a9c.patch";
hash = "sha256-kaKi32eFQ3hGLZLjiXmH9qs4GXezcDQ7zTdT2+D8NcQ=";
})
];
npmDepsHash = "sha256-J3/S/jYQvO/U8StDtYI+jozon0d4VCdeqFX6x1hHzMo=";
nativeBuildInputs = [
makeWrapper
@ -105,7 +113,7 @@ in buildNpmPackage rec {
$out/lib/node_modules/deltachat-desktop/html-dist/fonts
done
makeWrapper ${electron_18}/bin/electron $out/bin/deltachat \
makeWrapper ${electron_22}/bin/electron $out/bin/deltachat \
--set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher${stdenv.hostPlatform.extensions.sharedLibrary} \
--add-flags $out/lib/node_modules/deltachat-desktop