equibop: remove broken withSystemEquicord argument

Changed files
+1 -26
pkgs
+1 -9
pkgs/by-name/eq/equibop/package.nix
···
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";
···
patches = [
./disable_update_checking.patch
-
]
-
++ lib.optional withSystemEquicord (
-
replaceVars ./use_system_equicord.patch {
-
inherit equicord;
-
}
-
);
env = {
ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
···
nix-update-script,
withTTS ? true,
withMiddleClickScroll ? false,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "equibop";
···
patches = [
./disable_update_checking.patch
+
];
env = {
ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
-17
pkgs/by-name/eq/equibop/use_system_equicord.patch
···
-
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)`;
-
-
···