From 717a72680b0f5192d86077c6447c36cd0dd59f35 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Tue, 26 May 2026 18:32:25 +0200 Subject: [PATCH] zulip: factor out pinned electron, use electron.dist --- pkgs/by-name/zu/zulip/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/zu/zulip/package.nix b/pkgs/by-name/zu/zulip/package.nix index 34657eefa06b..14cd14a49b54 100644 --- a/pkgs/by-name/zu/zulip/package.nix +++ b/pkgs/by-name/zu/zulip/package.nix @@ -13,6 +13,9 @@ copyDesktopItems, }: +let + electron = electron_39; +in stdenv.mkDerivation (finalAttrs: { pname = "zulip"; version = "5.12.3"; @@ -43,10 +46,10 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild - npm_config_nodedir=${electron_39.headers} \ + npm_config_nodedir=${electron.headers} \ node --run pack -- \ - -c.electronDist=${electron_39}/libexec/electron \ - -c.electronVersion=${electron_39.version} + -c.electronDist=${electron.dist} \ + -c.electronVersion=${electron.version} runHook postBuild ''; @@ -59,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { install -m 444 -D app/resources/zulip.png $out/share/icons/hicolor/512x512/apps/zulip.png - makeBinaryWrapper '${lib.getExe electron_39}' "$out/bin/zulip" \ + makeBinaryWrapper '${lib.getExe electron}' "$out/bin/zulip" \ --add-flags "$out/share/lib/zulip/app.asar" \ --inherit-argv0