Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions pkgs/by-name/we/webcord-vencord/package.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
# allow overriding electron
electron_36,
electron_37,
webcord,
replaceVars,
lib,
vencord-web-extension,
}:

# nixpkgs-update: no auto update
(webcord.override { inherit electron_36; }).overrideAttrs (old: {
(webcord.override { inherit electron_37; }).overrideAttrs (old: {
pname = "webcord-vencord";

patches = (old.patches or [ ]) ++ [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/we/webcord/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
copyDesktopItems,
python3,
xdg-utils,
electron_36,
electron_37,
makeDesktopItem,
}:

Expand Down Expand Up @@ -55,7 +55,7 @@ buildNpmPackage rec {
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
makeWrapper '${lib.getExe electron_36}' $out/bin/webcord \
makeWrapper '${lib.getExe electron_37}' $out/bin/webcord \
--suffix PATH : "${binPath}" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
--add-flags $out/lib/node_modules/webcord/
Expand Down
2 changes: 1 addition & 1 deletion pkgs/by-name/we/webcord/update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ latestVersion="$(expr "$latestTag" : 'v\(.*\)')"

nix-update --version "$latestVersion" webcord
electronVersion=$(curl_github "https://raw.githubusercontent.com/SpacingBat3/WebCord/v$latestVersion/package.json" | jq -r ".devDependencies.electron" | sed -r 's|^\^([0-9]+).*|\1|')
sed -r "/webcord = / s|(electron_)[0-9]+|\1$electronVersion|" -i pkgs/top-level/all-packages.nix
sed -r "s|(electron_)[0-9]+|\1$electronVersion|" -i pkgs/by-name/we/webcord{,-vencord}/package.nix
Loading