From 45a58291de50d9587fcfaa2e75a3f162282bad9f Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Tue, 26 Jul 2022 22:34:45 -0400 Subject: [PATCH] deltachat-desktop: remove special case for electron on darwin --- .../instant-messengers/deltachat-desktop/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index df97777409cd..835442642348 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -32,10 +32,6 @@ let hash = "sha256-4rpoDQ3o0WdWg/TmazTI+J0hL/MxwHcNMXWMq7GE7Tk="; }; }); - electronExec = if stdenv.isDarwin then - "${electron_18}/Applications/Electron.app/Contents/MacOS/Electron" - else - "${electron_18}/bin/electron"; esbuild' = esbuild.override { buildGoModule = args: buildGoModule (args // rec { version = "0.12.29"; @@ -102,7 +98,7 @@ in nodePackages.deltachat-desktop.override rec { $out/lib/node_modules/deltachat-desktop/html-dist/fonts done - makeWrapper ${electronExec} $out/bin/deltachat \ + makeWrapper ${electron_18}/bin/electron $out/bin/deltachat \ --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher${stdenv.hostPlatform.extensions.sharedLibrary} \ --add-flags $out/lib/node_modules/deltachat-desktop '';