fix: remove vesktop patches
The nix package now is up to date and there is no more idiotic updates from Discord
This commit is contained in:
parent
5dff38972e
commit
cac7955f65
|
@ -81,7 +81,7 @@
|
||||||
|
|
||||||
## Tools
|
## Tools
|
||||||
# Utilities
|
# Utilities
|
||||||
(callPackage ./programs/vesktop/default.nix {})
|
vesktop
|
||||||
brightnessctl
|
brightnessctl
|
||||||
discord
|
discord
|
||||||
firefox
|
firefox
|
||||||
|
|
|
@ -1,149 +0,0 @@
|
||||||
{ lib
|
|
||||||
, stdenv
|
|
||||||
, stdenvNoCC
|
|
||||||
, gcc13Stdenv
|
|
||||||
, fetchFromGitHub
|
|
||||||
, substituteAll
|
|
||||||
, makeWrapper
|
|
||||||
, makeDesktopItem
|
|
||||||
, copyDesktopItems
|
|
||||||
, electron
|
|
||||||
, pipewire
|
|
||||||
, libpulseaudio
|
|
||||||
, libicns
|
|
||||||
, jq
|
|
||||||
, moreutils
|
|
||||||
, nodePackages
|
|
||||||
, callPackage
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
vencord = callPackage ./vencord-updated.nix {};
|
|
||||||
in
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
pname = "vesktop";
|
|
||||||
version = "0.4.1";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "Vencord";
|
|
||||||
repo = "Vesktop";
|
|
||||||
rev = "v${version}";
|
|
||||||
hash = "sha256-jSGad3qMhAdiGdwomQO6BIyHIbKrGLRGniGrJN97gN8=";
|
|
||||||
};
|
|
||||||
|
|
||||||
pnpm-deps = stdenvNoCC.mkDerivation {
|
|
||||||
pname = "${pname}-pnpm-deps";
|
|
||||||
inherit src version patches ELECTRON_SKIP_BINARY_DOWNLOAD;
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
|
||||||
jq
|
|
||||||
moreutils
|
|
||||||
nodePackages.pnpm
|
|
||||||
];
|
|
||||||
|
|
||||||
# https://github.com/NixOS/nixpkgs/blob/763e59ffedb5c25774387bf99bc725df5df82d10/pkgs/applications/misc/pot/default.nix#L56
|
|
||||||
installPhase = ''
|
|
||||||
export HOME=$(mktemp -d)
|
|
||||||
|
|
||||||
pnpm config set store-dir $out
|
|
||||||
pnpm install --frozen-lockfile --ignore-script
|
|
||||||
|
|
||||||
rm -rf $out/v3/tmp
|
|
||||||
for f in $(find $out -name "*.json"); do
|
|
||||||
sed -i -E -e 's/"checkedAt":[0-9]+,//g' $f
|
|
||||||
jq --sort-keys . $f | sponge $f
|
|
||||||
done
|
|
||||||
'';
|
|
||||||
|
|
||||||
dontFixup = true;
|
|
||||||
outputHashMode = "recursive";
|
|
||||||
outputHash = "sha256-lTeL+8QujWzx4ys2T+G55NUP51c8i5lB1vAkUtzkJlA=";
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
|
||||||
copyDesktopItems
|
|
||||||
nodePackages.pnpm
|
|
||||||
nodePackages.nodejs
|
|
||||||
makeWrapper
|
|
||||||
];
|
|
||||||
|
|
||||||
patches = [
|
|
||||||
(substituteAll { inherit vencord; src = ./use_system_vencord.patch; })
|
|
||||||
];
|
|
||||||
|
|
||||||
ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
|
|
||||||
|
|
||||||
preBuild = ''
|
|
||||||
export HOME=$(mktemp -d)
|
|
||||||
export STORE_PATH=$(mktemp -d)
|
|
||||||
|
|
||||||
cp -r ${pnpm-deps}/* "$STORE_PATH"
|
|
||||||
chmod -R +w "$STORE_PATH"
|
|
||||||
|
|
||||||
pnpm config set store-dir "$STORE_PATH"
|
|
||||||
pnpm install --offline --frozen-lockfile --ignore-script
|
|
||||||
patchShebangs node_modules/{*,.*}
|
|
||||||
'';
|
|
||||||
|
|
||||||
postBuild = ''
|
|
||||||
pnpm build
|
|
||||||
# using `pnpm exec` here apparently makes it ignore ELECTRON_SKIP_BINARY_DOWNLOAD
|
|
||||||
./node_modules/.bin/electron-builder \
|
|
||||||
--dir \
|
|
||||||
-c.electronDist=${electron}/libexec/electron \
|
|
||||||
-c.electronVersion=${electron.version}
|
|
||||||
'';
|
|
||||||
|
|
||||||
# this is consistent with other nixpkgs electron packages and upstream, as far as I am aware
|
|
||||||
# yes, upstream really packages it as "vesktop" but uses "vencorddesktop" file names
|
|
||||||
installPhase =
|
|
||||||
let
|
|
||||||
# this is mainly required for venmic
|
|
||||||
libPath = lib.makeLibraryPath [
|
|
||||||
libpulseaudio
|
|
||||||
pipewire
|
|
||||||
gcc13Stdenv.cc.cc.lib
|
|
||||||
];
|
|
||||||
in
|
|
||||||
''
|
|
||||||
runHook preInstall
|
|
||||||
|
|
||||||
mkdir -p $out/opt/Vesktop/resources
|
|
||||||
cp dist/linux-unpacked/resources/app.asar $out/opt/Vesktop/resources
|
|
||||||
|
|
||||||
pushd build
|
|
||||||
${libicns}/bin/icns2png -x icon.icns
|
|
||||||
for file in icon_*x32.png; do
|
|
||||||
file_suffix=''${file//icon_}
|
|
||||||
install -Dm0644 $file $out/share/icons/hicolor/''${file_suffix//x32.png}/apps/vencorddesktop.png
|
|
||||||
done
|
|
||||||
|
|
||||||
makeWrapper ${electron}/bin/electron $out/bin/vencorddesktop \
|
|
||||||
--prefix LD_LIBRARY_PATH : ${libPath} \
|
|
||||||
--add-flags $out/opt/Vesktop/resources/app.asar \
|
|
||||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
|
|
||||||
|
|
||||||
runHook postInstall
|
|
||||||
'';
|
|
||||||
|
|
||||||
desktopItems = [
|
|
||||||
(makeDesktopItem {
|
|
||||||
name = "vencorddesktop";
|
|
||||||
desktopName = "Vesktop";
|
|
||||||
exec = "vencorddesktop %U";
|
|
||||||
icon = "vencorddesktop";
|
|
||||||
startupWMClass = "VencordDesktop";
|
|
||||||
genericName = "Internet Messenger";
|
|
||||||
keywords = [ "discord" "vencord" "electron" "chat" ];
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "An alternate client for Discord with Vencord built-in";
|
|
||||||
homepage = "https://github.com/Vencord/Vesktop";
|
|
||||||
license = licenses.gpl3Only;
|
|
||||||
maintainers = with maintainers; [ getchoo Scrumplex vgskye ];
|
|
||||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
|
||||||
mainProgram = "vencorddesktop";
|
|
||||||
broken = stdenv.hostPlatform.isAarch64;
|
|
||||||
};
|
|
||||||
}
|
|
5863
programs/vesktop/package-lock.json
generated
5863
programs/vesktop/package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
@ -1,14 +0,0 @@
|
||||||
diff --git a/src/main/constants.ts b/src/main/constants.ts
|
|
||||||
index d5c5fa6..a1b32f1 100644
|
|
||||||
--- a/src/main/constants.ts
|
|
||||||
+++ b/src/main/constants.ts
|
|
||||||
@@ -16,7 +16,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_FILES_DIR =
|
|
||||||
- (require("./settings") as typeof import("./settings")).Settings.store.vencordDir || join(DATA_DIR, "vencordDist");
|
|
||||||
+ (require("./settings") as typeof import("./settings")).Settings.store.vencordDir || "@vencord@";
|
|
||||||
|
|
||||||
export const USER_AGENT = `Vesktop/${app.getVersion()} (https://github.com/Vencord/Vesktop)`;
|
|
||||||
|
|
||||||
|
|
|
@ -1,65 +0,0 @@
|
||||||
{ buildNpmPackage
|
|
||||||
, fetchFromGitHub
|
|
||||||
, lib
|
|
||||||
, esbuild
|
|
||||||
, buildWebExtension ? false
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
version = "1.6.0";
|
|
||||||
gitHash = "ffe6bb1";
|
|
||||||
in
|
|
||||||
buildNpmPackage rec {
|
|
||||||
pname = "vencord";
|
|
||||||
inherit version;
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "Vendicated";
|
|
||||||
repo = "Vencord";
|
|
||||||
rev = "v${version}";
|
|
||||||
hash = "sha256-t4+8ybPzqcCtTSukBBgvbD7HiKG4K51WPVnJg0RQbs8=";
|
|
||||||
};
|
|
||||||
|
|
||||||
ESBUILD_BINARY_PATH = lib.getExe (esbuild.overrideAttrs (final: _: {
|
|
||||||
version = "0.15.18";
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "evanw";
|
|
||||||
repo = "esbuild";
|
|
||||||
rev = "v${final.version}";
|
|
||||||
hash = "sha256-b9R1ML+pgRg9j2yrkQmBulPuLHYLUQvW+WTyR/Cq6zE=";
|
|
||||||
};
|
|
||||||
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
|
|
||||||
}));
|
|
||||||
|
|
||||||
# Supresses an error about esbuild's version.
|
|
||||||
npmRebuildFlags = [ "|| true" ];
|
|
||||||
|
|
||||||
makeCacheWritable = true;
|
|
||||||
npmDepsHash = "sha256-H2f6xdAa7fNETbQhIv+InCB7+O4nq0bx+RILjGjqXdY=";
|
|
||||||
npmFlags = [ "--legacy-peer-deps" ];
|
|
||||||
npmBuildScript = if buildWebExtension then "buildWeb" else "build";
|
|
||||||
npmBuildFlags = [ "--" "--standalone" "--disable-updater" ];
|
|
||||||
|
|
||||||
prePatch = ''
|
|
||||||
cp ${./package-lock.json} ./package-lock.json
|
|
||||||
chmod +w ./package-lock.json
|
|
||||||
'';
|
|
||||||
|
|
||||||
VENCORD_HASH = gitHash;
|
|
||||||
VENCORD_REMOTE = "${src.owner}/${src.repo}";
|
|
||||||
|
|
||||||
installPhase =
|
|
||||||
if buildWebExtension then ''
|
|
||||||
cp -r dist/chromium-unpacked/ $out
|
|
||||||
'' else ''
|
|
||||||
cp -r dist/ $out
|
|
||||||
'';
|
|
||||||
|
|
||||||
passthru.updateScript = ./update.sh;
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Vencord web extension";
|
|
||||||
homepage = "https://github.com/Vendicated/Vencord";
|
|
||||||
license = licenses.gpl3Only;
|
|
||||||
maintainers = with maintainers; [ FlafyDev fwam NotAShelf Scrumplex ];
|
|
||||||
};
|
|
||||||
}
|
|
Loading…
Reference in a new issue