equibop: 2.1.5 -> 2.1.6, remove broken withSystemEquicord argument (#436396)
This commit is contained in:
@@ -17,19 +17,16 @@
|
||||
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";
|
||||
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 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
patches
|
||||
;
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-0UNScJAdpcMOcBHGGG+SeGQon89qLXTCNmaxEswNFBI=";
|
||||
hash = "sha256-MDqAncWdU2rIQAGF/wx2gWxDf74P3fp3w4nA8b6AITw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -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;
|
||||
|
||||
@@ -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)`;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user