pyrox.dev
equibop: remove broken withSystemEquicord argument
gepbird.tngl.sh
+1
-9
pkgs/by-name/eq/equibop/package.nix
+1
-9
pkgs/by-name/eq/equibop/package.nix
···
17
17
nix-update-script,
18
18
withTTS ? true,
19
19
withMiddleClickScroll ? false,
20
-
# Enables the use of Equicord from nixpkgs instead of
21
-
# letting Equibop manage it's own version
22
-
withSystemEquicord ? false,
23
20
}:
24
21
stdenv.mkDerivation (finalAttrs: {
25
22
pname = "equibop";
···
65
62
66
63
patches = [
67
64
./disable_update_checking.patch
68
-
]
69
-
++ lib.optional withSystemEquicord (
70
-
replaceVars ./use_system_equicord.patch {
71
-
inherit equicord;
72
-
}
73
-
);
65
+
];
74
66
75
67
env = {
76
68
ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
-17
pkgs/by-name/eq/equibop/use_system_equicord.patch
-17
pkgs/by-name/eq/equibop/use_system_equicord.patch
···
1
-
diff --git i/src/main/constants.ts w/src/main/constants.ts
2
-
index afb171f..c6a014e 100644
3
-
--- i/src/main/constants.ts
4
-
+++ w/src/main/constants.ts
5
-
@@ -30,10 +30,7 @@ export const VENCORD_THEMES_DIR = join(DATA_DIR, "themes");
6
-
7
-
// needs to be inline require because of circular dependency
8
-
// as otherwise "DATA_DIR" (which is used by ./settings) will be uninitialised
9
-
-export const VENCORD_DIR = (() => {
10
-
- const { State } = require("./settings") as typeof import("./settings");
11
-
- return State.store.equicordDir ? join(State.store.equicordDir, "equibop") : join(SESSION_DATA_DIR, "equicord.asar");
12
-
-})();
13
-
+export const VENCORD_DIR = "@equicord@";
14
-
15
-
export const USER_AGENT = `Equibop/${app.getVersion()} (https://github.com/Equicord/Equibop)`;
16
-
17
-