From 96c91f1f26bae33eda0f38c820fae9e8b5602626 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sun, 24 Aug 2025 07:34:27 +0000
Subject: [PATCH 1/2] equibop: 2.1.5 -> 2.1.6

---
 pkgs/by-name/eq/equibop/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/eq/equibop/package.nix b/pkgs/by-name/eq/equibop/package.nix
index d13e39f570c6..d0bf4846a87e 100644
--- a/pkgs/by-name/eq/equibop/package.nix
+++ b/pkgs/by-name/eq/equibop/package.nix
@@ -23,13 +23,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "equibop";
-  version = "2.1.5";
+  version = "2.1.6";
 
   src = fetchFromGitHub {
     owner = "Equicord";
     repo = "Equibop";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-uod94pP261Alq+dby+/diiLT0KFjXswVapwXYAAAkbs=";
+    hash = "sha256-0OtCxz7g1xMmnkDke34deaS3dx5b8bGOC0Vbq6BIObg=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
       patches
       ;
     fetcherVersion = 1;
-    hash = "sha256-0UNScJAdpcMOcBHGGG+SeGQon89qLXTCNmaxEswNFBI=";
+    hash = "sha256-MDqAncWdU2rIQAGF/wx2gWxDf74P3fp3w4nA8b6AITw=";
   };
 
   nativeBuildInputs = [

From e4e6cc242db3ace23cae472ba60f53a817378e9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sun, 24 Aug 2025 09:42:34 +0200
Subject: [PATCH 2/2] equibop: remove broken withSystemEquicord argument

---
 pkgs/by-name/eq/equibop/package.nix             | 10 +---------
 .../eq/equibop/use_system_equicord.patch        | 17 -----------------
 2 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 pkgs/by-name/eq/equibop/use_system_equicord.patch

diff --git a/pkgs/by-name/eq/equibop/package.nix b/pkgs/by-name/eq/equibop/package.nix
index d0bf4846a87e..0a083416cbea 100644
--- a/pkgs/by-name/eq/equibop/package.nix
+++ b/pkgs/by-name/eq/equibop/package.nix
@@ -17,9 +17,6 @@
   nix-update-script,
   withTTS ? true,
   withMiddleClickScroll ? false,
-  # Enables the use of Equicord from nixpkgs instead of
-  # letting Equibop manage it's own version
-  withSystemEquicord ? false,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "equibop";
@@ -65,12 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [
     ./disable_update_checking.patch
-  ]
-  ++ lib.optional withSystemEquicord (
-    replaceVars ./use_system_equicord.patch {
-      inherit equicord;
-    }
-  );
+  ];
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
diff --git a/pkgs/by-name/eq/equibop/use_system_equicord.patch b/pkgs/by-name/eq/equibop/use_system_equicord.patch
deleted file mode 100644
index 3401e10ba331..000000000000
--- a/pkgs/by-name/eq/equibop/use_system_equicord.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git i/src/main/constants.ts w/src/main/constants.ts
-index afb171f..c6a014e 100644
---- i/src/main/constants.ts
-+++ w/src/main/constants.ts
-@@ -30,10 +30,7 @@ export const VENCORD_THEMES_DIR = join(DATA_DIR, "themes");
- 
- // needs to be inline require because of circular dependency
- // as otherwise "DATA_DIR" (which is used by ./settings) will be uninitialised
--export const VENCORD_DIR = (() => {
--    const { State } = require("./settings") as typeof import("./settings");
--    return State.store.equicordDir ? join(State.store.equicordDir, "equibop") : join(SESSION_DATA_DIR, "equicord.asar");
--})();
-+export const VENCORD_DIR = "@equicord@";
- 
- export const USER_AGENT = `Equibop/${app.getVersion()} (https://github.com/Equicord/Equibop)`;
- 
-