about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorAleksana <me@aleksana.moe>2024-05-26 15:57:10 +0800
committerGitHub <noreply@github.com>2024-05-26 15:57:10 +0800
commitc54273a42eb8c60ad5a733f28dd2c2a6c6e05e0a (patch)
tree49cc0e2424dc8b1bfaa2b9f4362e3123da646467 /pkgs
parentee78cce3b5ef86ea8831f3cb98fef30005a6706c (diff)
parentbfed80cb51cedf1185737dc642a5f28b8afb4098 (diff)
Merge pull request #313223 from eclairevoyant/webcord-vencord-fix
webcord-vencord: fix runtime segfault
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/by-name/we/webcord-vencord/package.nix4
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/by-name/we/webcord-vencord/package.nix b/pkgs/by-name/we/webcord-vencord/package.nix
index 352e372d00adc..2ac078def4eed 100644
--- a/pkgs/by-name/we/webcord-vencord/package.nix
+++ b/pkgs/by-name/we/webcord-vencord/package.nix
@@ -1,4 +1,6 @@
 {
+  # allow overriding electron
+  electron,
   webcord,
   substituteAll,
   lib,
@@ -6,7 +8,7 @@
 }:
 
 # nixpkgs-update: no auto update
-webcord.overrideAttrs (old: {
+(webcord.override { inherit electron; }).overrideAttrs (old: {
   pname = "webcord-vencord";
 
   patches = (old.patches or [ ]) ++ [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index acc4b8c93379e..ed62a620aed8b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -35409,6 +35409,8 @@ with pkgs;
 
   webcord = callPackage ../by-name/we/webcord/package.nix { electron = electron_30; };
 
+  webcord-vencord = callPackage ../by-name/we/webcord-vencord/package.nix { electron = electron_29; };
+
   webex = callPackage ../applications/networking/instant-messengers/webex { };
 
   webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {