colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

webcord: 4.3.0 -> 4.4.0

Browse Source
This commit is contained in:
huantian 2023-08-15 20:56:23 -07:00
parent 074dea1e11
commit c7a2d51cb4
No known key found for this signature in database
GPG Key ID: 4A0318E04E555DE5
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/networking/instant-messengers/webcord/default.nix
View File

@ -6,23 +6,23 @@
, pipewire , pipewire
, libpulseaudio , libpulseaudio
, xdg-utils , xdg-utils
, electron_25 , electron_26
, makeDesktopItem , makeDesktopItem
, nix-update-script , nix-update-script
}: }:
buildNpmPackage rec { buildNpmPackage rec {
pname = "webcord"; pname = "webcord";
version = "4.3.0"; version = "4.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SpacingBat3"; owner = "SpacingBat3";
repo = "WebCord"; repo = "WebCord";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-E/WXAVSCNTDEDaz71LXOHUf/APFO2uSpkTRhlZfQp0E="; hash = "sha256-Kiw3pebjH9Pz5oi6Gbjxrjd/kvozapLNqfWLVuTXF/I=";
}; };
npmDepsHash = "sha256-vGaYjM13seVmRbVPyDIM+qhGTCj6rw/el6Dq3KMzDks="; npmDepsHash = "sha256-CPGfhV8VXbpX9UB5oQhI+IwFWPgYq2dGnSuyByMNGg4=";
nativeBuildInputs = [ nativeBuildInputs = [
copyDesktopItems copyDesktopItems
@ -56,7 +56,7 @@ buildNpmPackage rec {
install -Dm644 sources/assets/icons/app.png $out/share/icons/hicolor/256x256/apps/webcord.png install -Dm644 sources/assets/icons/app.png $out/share/icons/hicolor/256x256/apps/webcord.png
# Add xdg-utils to path via suffix, per PR #181171 # Add xdg-utils to path via suffix, per PR #181171
makeWrapper '${electron_25}/bin/electron' $out/bin/webcord \ makeWrapper '${electron_26}/bin/electron' $out/bin/webcord \
--prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/webcord \ --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/webcord \
--suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \ --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" \
@ -86,6 +86,6 @@ buildNpmPackage rec {
license = licenses.mit; license = licenses.mit;
mainProgram = "webcord"; mainProgram = "webcord";
maintainers = with maintainers; [ huantian ]; maintainers = with maintainers; [ huantian ];
platforms = electron_25.meta.platforms; platforms = platforms.linux;
}; };
} }

9
pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/default.nix
View File

@ -2,10 +2,9 @@
, substituteAll , substituteAll
, lib , lib
, vencord-web-extension , vencord-web-extension
, electron_24
}: }:
(webcord.overrideAttrs (old: { webcord.overrideAttrs (old: {
patches = (old.patches or [ ]) ++ [ patches = (old.patches or [ ]) ++ [
(substituteAll { (substituteAll {
src = ./add-extension.patch; src = ./add-extension.patch;
@ -17,8 +16,4 @@
description = "Webcord with Vencord web extension"; description = "Webcord with Vencord web extension";
maintainers = with maintainers; [ FlafyDev NotAShelf ]; maintainers = with maintainers; [ FlafyDev NotAShelf ];
}; };
})).override { })
# Webcord has updated to electron 25, but that causes a segfault
# when launching webcord-vencord on wayland, so downgrade it for now.
electron_25 = electron_24;
}