Skip to content

Commit c68b327

Browse files
vbglJohnRTitor
authored andcommitted
zulip: 5.11.1 → 5.12.0
1 parent 2a5b34d commit c68b327

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

pkgs/by-name/zu/zulip/package.nix

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
11
{ lib
22
, fetchFromGitHub
33
, buildNpmPackage
4-
, electron_32
4+
, python3
5+
, electron_35
56
, makeDesktopItem
67
, makeShellWrapper
78
, copyDesktopItems
89
}:
910

1011
buildNpmPackage rec {
1112
pname = "zulip";
12-
version = "5.11.1";
13+
version = "5.12.0";
1314

1415
src = fetchFromGitHub {
1516
owner = "zulip";
1617
repo = "zulip-desktop";
17-
rev = "v${version}";
18-
hash = "sha256-ELuQ/K5QhtS4QiTR35J9VtYNe1qBrS56Ay6mtcGL+FI=";
18+
tag = "v${version}";
19+
hash = "sha256-YDb69tJCR58DARssnZgdVxtRpR8vHsawCTv7kQ56y+8=";
1920
};
2021

21-
npmDepsHash = "sha256-13Rlqa7TC2JUq6q1b2U5X3EXpOJGZ62IeF163/mTo68=";
22+
npmDepsHash = "sha256-MKKN6prUdWaHm27GybdbswDMNJH0xVffXsT2ZwroOHI=";
2223

2324
env = {
2425
ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
@@ -27,15 +28,16 @@ buildNpmPackage rec {
2728
nativeBuildInputs = [
2829
makeShellWrapper
2930
copyDesktopItems
31+
(python3.withPackages (ps: with ps; [ distutils ]))
3032
];
3133

3234
dontNpmBuild = true;
3335
buildPhase = ''
3436
runHook preBuild
3537
3638
npm run pack -- \
37-
-c.electronDist=${electron_32}/libexec/electron \
38-
-c.electronVersion=${electron_32.version}
39+
-c.electronDist=${electron_35}/libexec/electron \
40+
-c.electronVersion=${electron_35.version}
3941
4042
runHook postBuild
4143
'';
@@ -48,7 +50,7 @@ buildNpmPackage rec {
4850
4951
install -m 444 -D app/resources/zulip.png $out/share/icons/hicolor/512x512/apps/zulip.png
5052
51-
makeShellWrapper '${lib.getExe electron_32}' "$out/bin/zulip" \
53+
makeShellWrapper '${lib.getExe electron_35}' "$out/bin/zulip" \
5254
--add-flags "$out/share/lib/zulip/app.asar" \
5355
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-wayland-ime=true}}" \
5456
--inherit-argv0

0 commit comments

Comments
 (0)