From 8855c8bfcf6df4c859a4d43d4dec6919d0075b96 Mon Sep 17 00:00:00 2001 From: Airradda Date: Mon, 15 Jan 2024 20:23:31 -0600 Subject: [PATCH] vesktop: 0.4.4 -> 1.5.0 --- pkgs/by-name/ve/vesktop/package.nix | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index 74f52e2c9278..98bbb2f04e0c 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -20,13 +20,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vesktop"; - version = "0.4.4"; + version = "1.5.0"; src = fetchFromGitHub { owner = "Vencord"; repo = "Vesktop"; rev = "v${finalAttrs.version}"; - hash = "sha256-Ot2O5J1wUZAWgdpJNaEUSwtbcNqDdGhzuCtx8Qg+4gg="; + hash = "sha256-27998q9wbaNP1xYY+KHTBeJRfR6Q/K0LNdbRb3YHC6c="; }; # NOTE: This requires pnpm 8.10.0 or newer @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { dontBuild = true; dontFixup = true; outputHashMode = "recursive"; - outputHash = "sha256-v6ibAcfYgr1VjGK7NUF4DKd5da03mZndPUAnSl++RqE="; + outputHash = "sha256-cnk+KFdvsgG1wGDib7zgIS6/RkrR5EYAHtHcrFSU0Es="; }; nativeBuildInputs = [ @@ -111,7 +111,6 @@ stdenv.mkDerivation (finalAttrs: { ''; # 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 @@ -132,10 +131,10 @@ stdenv.mkDerivation (finalAttrs: { ${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 + install -Dm0644 $file $out/share/icons/hicolor/''${file_suffix//x32.png}/apps/vesktop.png done - makeWrapper ${electron}/bin/electron $out/bin/vencorddesktop \ + makeWrapper ${electron}/bin/electron $out/bin/vesktop \ --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}}" @@ -145,11 +144,11 @@ stdenv.mkDerivation (finalAttrs: { desktopItems = [ (makeDesktopItem { - name = "vencorddesktop"; + name = "vesktop"; desktopName = "Vesktop"; - exec = "vencorddesktop %U"; - icon = "vencorddesktop"; - startupWMClass = "VencordDesktop"; + exec = "vesktop %U"; + icon = "vesktop"; + startupWMClass = "Vesktop"; genericName = "Internet Messenger"; keywords = [ "discord" "vencord" "electron" "chat" ]; categories = [ "Network" "InstantMessaging" "Chat" ]; @@ -166,6 +165,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3Only; maintainers = with maintainers; [ getchoo Scrumplex vgskye pluiedev ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; - mainProgram = "vencorddesktop"; + mainProgram = "vesktop"; }; })