vesktop: 1.5.2 -> 1.5.3

This commit is contained in:
Joshua Manchester 2024-07-06 20:37:10 +01:00 committed by Yaya
parent 655a58a72a
commit bedbc6e36e
4 changed files with 21 additions and 23 deletions

View File

@ -1,12 +1,12 @@
diff --git a/src/updater/main.ts b/src/updater/main.ts diff --git a/src/main/index.ts b/src/main/index.ts
index 059afb9..274802e 100644 index 2e0d6f7..1108c0f 100644
--- a/src/updater/main.ts --- a/src/main/index.ts
+++ b/src/updater/main.ts +++ b/src/main/index.ts
@@ -77,6 +77,7 @@ function isOutdated(oldVersion: string, newVersion: string) { @@ -20,7 +20,6 @@ import { isDeckGameMode } from "./utils/steamOS";
if (IS_DEV) {
require("source-map-support").install();
} else {
- autoUpdater.checkForUpdatesAndNotify();
} }
export async function checkUpdates() { // Make the Vencord files use our DATA_DIR
+ return;
if (Settings.store.checkUpdates === false) return;
try {

View File

@ -13,7 +13,7 @@
pipewire, pipewire,
libpulseaudio, libpulseaudio,
autoPatchelfHook, autoPatchelfHook,
pnpm, pnpm_9,
nodejs, nodejs,
withTTS ? true, withTTS ? true,
withMiddleClickScroll ? false, withMiddleClickScroll ? false,
@ -23,29 +23,29 @@
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "vesktop"; pname = "vesktop";
version = "1.5.2"; version = "1.5.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Vencord"; owner = "Vencord";
repo = "Vesktop"; repo = "Vesktop";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-cZOyydwpIW9Xq716KVi1RGtSlgVnOP3w8vXDwouS70E="; hash = "sha256-HlT7ddlrMHG1qOCqdaYjuWhJD+5FF1Nkv2sfXLWd07o=";
}; };
pnpmDeps = pnpm.fetchDeps { pnpmDeps = pnpm_9.fetchDeps {
inherit (finalAttrs) inherit (finalAttrs)
pname pname
version version
src src
patches patches
; ;
hash = "sha256-PogE8uf3W5cKSCqFHMz7FOvT7ONUP4FiFWGBgtk3UC8="; hash = "sha256-rizJu6v04wFEpJtakC2tfPg/uylz7gAOzJiXvUwdDI4=";
}; };
nativeBuildInputs = nativeBuildInputs =
[ [
nodejs nodejs
pnpm.configHook pnpm_9.configHook
] ]
++ lib.optionals stdenv.isLinux [ ++ lib.optionals stdenv.isLinux [
# vesktop uses venmic, which is a shipped as a prebuilt node module # vesktop uses venmic, which is a shipped as a prebuilt node module

View File

@ -1,13 +1,13 @@
diff --git a/src/main/constants.ts b/src/main/constants.ts diff --git a/src/main/constants.ts b/src/main/constants.ts
index d5c5fa6..a1b32f1 100644 index 40d91a5..7b46bbf 100644
--- a/src/main/constants.ts --- a/src/main/constants.ts
+++ b/src/main/constants.ts +++ b/src/main/constants.ts
@@ -16,7 +16,7 @@ export const VENCORD_THEMES_DIR = join(DATA_DIR, "themes"); @@ -49,7 +49,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 // as otherwise "DATA_DIR" (which is used by ./settings) will be uninitialised
export const VENCORD_FILES_DIR = export const VENCORD_FILES_DIR =
- (require("./settings") as typeof import("./settings")).Settings.store.vencordDir || join(DATA_DIR, "vencordDist"); (require("./settings") as typeof import("./settings")).State.store.vencordDir ||
+ (require("./settings") as typeof import("./settings")).Settings.store.vencordDir || "@vencord@"; - join(SESSION_DATA_DIR, "vencordFiles");
+ "@vencord@";
export const USER_AGENT = `Vesktop/${app.getVersion()} (https://github.com/Vencord/Vesktop)`; export const USER_AGENT = `Vesktop/${app.getVersion()} (https://github.com/Vencord/Vesktop)`;

View File

@ -24583,8 +24583,6 @@ with pkgs;
vencord-web-extension = callPackage ../by-name/ve/vencord/package.nix { buildWebExtension = true; }; vencord-web-extension = callPackage ../by-name/ve/vencord/package.nix { buildWebExtension = true; };
vesktop = callPackage ../by-name/ve/vesktop/package.nix { pnpm = pnpm_8; };
vid-stab = callPackage ../development/libraries/vid-stab { vid-stab = callPackage ../development/libraries/vid-stab {
inherit (llvmPackages) openmp; inherit (llvmPackages) openmp;
}; };