pyrox.dev
Merge pull request #249454 from huantianad/webcord-440
webcord: 4.3.0 -> 4.4.0
authored by
Weijia Wang
and committed by
GitHub
06a2910a
f18e0b18
+6
-6
pkgs/applications/networking/instant-messengers/webcord/default.nix
+6
-6
pkgs/applications/networking/instant-messengers/webcord/default.nix
···
6
6
, pipewire
7
7
, libpulseaudio
8
8
, xdg-utils
9
-
, electron_25
9
+
, electron_26
10
10
, makeDesktopItem
11
11
, nix-update-script
12
12
}:
13
13
14
14
buildNpmPackage rec {
15
15
pname = "webcord";
16
-
version = "4.3.0";
16
+
version = "4.4.0";
17
17
18
18
src = fetchFromGitHub {
19
19
owner = "SpacingBat3";
20
20
repo = "WebCord";
21
21
rev = "v${version}";
22
-
hash = "sha256-E/WXAVSCNTDEDaz71LXOHUf/APFO2uSpkTRhlZfQp0E=";
22
+
hash = "sha256-Kiw3pebjH9Pz5oi6Gbjxrjd/kvozapLNqfWLVuTXF/I=";
23
23
};
24
24
25
-
npmDepsHash = "sha256-vGaYjM13seVmRbVPyDIM+qhGTCj6rw/el6Dq3KMzDks=";
25
+
npmDepsHash = "sha256-CPGfhV8VXbpX9UB5oQhI+IwFWPgYq2dGnSuyByMNGg4=";
26
26
27
27
nativeBuildInputs = [
28
28
copyDesktopItems
···
56
56
install -Dm644 sources/assets/icons/app.png $out/share/icons/hicolor/256x256/apps/webcord.png
57
57
58
58
# Add xdg-utils to path via suffix, per PR #181171
59
-
makeWrapper '${electron_25}/bin/electron' $out/bin/webcord \
59
+
makeWrapper '${electron_26}/bin/electron' $out/bin/webcord \
60
60
--prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/webcord \
61
61
--suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \
62
62
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" \
···
86
86
license = licenses.mit;
87
87
mainProgram = "webcord";
88
88
maintainers = with maintainers; [ huantian ];
89
-
platforms = electron_25.meta.platforms;
89
+
platforms = platforms.linux;
90
90
};
91
91
}
+2
-7
pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/default.nix
+2
-7
pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/default.nix
···
2
2
, substituteAll
3
3
, lib
4
4
, vencord-web-extension
5
-
, electron_24
6
5
}:
7
6
8
-
(webcord.overrideAttrs (old: {
7
+
webcord.overrideAttrs (old: {
9
8
patches = (old.patches or [ ]) ++ [
10
9
(substituteAll {
11
10
src = ./add-extension.patch;
···
17
16
description = "Webcord with Vencord web extension";
18
17
maintainers = with maintainers; [ FlafyDev NotAShelf ];
19
18
};
20
-
})).override {
21
-
# Webcord has updated to electron 25, but that causes a segfault
22
-
# when launching webcord-vencord on wayland, so downgrade it for now.
23
-
electron_25 = electron_24;
24
-
}
19
+
})