Skip to content

zulip: 5.11.1 → 5.12.0 #390714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JohnRTitor merged 1 commit into from
Mar 27, 2025
Merged

zulip: 5.11.1 → 5.12.0 #390714

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions pkgs/by-name/zu/zulip/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
{ lib
, fetchFromGitHub
, buildNpmPackage
, electron_32
, python3
, electron_35
, makeDesktopItem
, makeShellWrapper
, copyDesktopItems
}:

buildNpmPackage rec {
pname = "zulip";
version = "5.11.1";
version = "5.12.0";

src = fetchFromGitHub {
owner = "zulip";
repo = "zulip-desktop";
rev = "v${version}";
hash = "sha256-ELuQ/K5QhtS4QiTR35J9VtYNe1qBrS56Ay6mtcGL+FI=";
tag = "v${version}";
hash = "sha256-YDb69tJCR58DARssnZgdVxtRpR8vHsawCTv7kQ56y+8=";
};

npmDepsHash = "sha256-13Rlqa7TC2JUq6q1b2U5X3EXpOJGZ62IeF163/mTo68=";
npmDepsHash = "sha256-MKKN6prUdWaHm27GybdbswDMNJH0xVffXsT2ZwroOHI=";

env = {
ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
Expand All @@ -27,15 +28,16 @@ buildNpmPackage rec {
nativeBuildInputs = [
makeShellWrapper
copyDesktopItems
(python3.withPackages (ps: with ps; [ distutils ]))
];

dontNpmBuild = true;
buildPhase = ''
runHook preBuild

npm run pack -- \
-c.electronDist=${electron_32}/libexec/electron \
-c.electronVersion=${electron_32.version}
-c.electronDist=${electron_35}/libexec/electron \
-c.electronVersion=${electron_35.version}

runHook postBuild
'';
Expand All @@ -48,7 +50,7 @@ buildNpmPackage rec {

install -m 444 -D app/resources/zulip.png $out/share/icons/hicolor/512x512/apps/zulip.png

makeShellWrapper '${lib.getExe electron_32}' "$out/bin/zulip" \
makeShellWrapper '${lib.getExe electron_35}' "$out/bin/zulip" \
--add-flags "$out/share/lib/zulip/app.asar" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-wayland-ime=true}}" \
--inherit-argv0
Expand Down