From 9d65f633bfa2c8d3091a805079a1d4044fdbc9ab Mon Sep 17 00:00:00 2001 From: seth Date: Sat, 21 Oct 2023 20:56:37 -0400 Subject: [PATCH 1/4] vesktop: 0.3.3 -> 0.4.1 Diff: https://github.com/Vencord/Vesktop/compare/v0.3.3...v0.4.1 --- pkgs/by-name/ve/vesktop/package.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index d25167ebe308..55bd1c18fdc6 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -1,6 +1,7 @@ { lib , stdenv , stdenvNoCC +, gcc13Stdenv , fetchFromGitHub , substituteAll , makeWrapper @@ -9,6 +10,7 @@ , vencord , electron , pipewire +, libpulseaudio , libicns , jq , moreutils @@ -16,13 +18,13 @@ }: stdenv.mkDerivation rec { pname = "vesktop"; - version = "0.3.3"; + version = "0.4.1"; src = fetchFromGitHub { owner = "Vencord"; repo = "Vesktop"; rev = "v${version}"; - sha256 = "sha256-Njs3tACxUyRolYUtS/q2lITIQnUBFXVXWZEfQ66HpPM="; + sha256 = "sha256-jSGad3qMhAdiGdwomQO6BIyHIbKrGLRGniGrJN97gN8="; }; pnpm-deps = stdenvNoCC.mkDerivation { @@ -51,7 +53,7 @@ stdenv.mkDerivation rec { dontFixup = true; outputHashMode = "recursive"; - outputHash = "sha256-vInaSLGahRUgvwAeUcI+oV84L+tgNRCmfFpE0aUD4X4="; + outputHash = "sha256-lTeL+8QujWzx4ys2T+G55NUP51c8i5lB1vAkUtzkJlA="; }; nativeBuildInputs = [ @@ -92,7 +94,12 @@ stdenv.mkDerivation rec { # yes, upstream really packages it as "vesktop" but uses "vencorddesktop" file names installPhase = let - libPath = lib.makeLibraryPath [ pipewire ]; + # this is mainly required for venmic + libPath = lib.makeLibraryPath [ + libpulseaudio + pipewire + gcc13Stdenv.cc.cc.lib + ]; in '' runHook preInstall From 54ff6977e8a72bcb22128e1ba279c9efebbec1e0 Mon Sep 17 00:00:00 2001 From: seth Date: Sun, 22 Oct 2023 16:02:51 -0400 Subject: [PATCH 2/4] vesktop: better specify platforms these are platforms we plan to support for now and can test, though some others such as i686-linux could also be supported in the future --- pkgs/by-name/ve/vesktop/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index 55bd1c18fdc6..dae604d23054 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -139,7 +139,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Vencord/Vesktop"; license = licenses.gpl3Only; maintainers = with maintainers; [ getchoo Scrumplex vgskye ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "aarch64-linux" ]; mainProgram = "vencorddesktop"; }; } From 966c0d2ac42ea3b8df9062549d9bee94aebfafd7 Mon Sep 17 00:00:00 2001 From: seth Date: Sun, 22 Oct 2023 16:04:52 -0400 Subject: [PATCH 3/4] vesktop: mark aarch64-linux as broken while the package builds and mostly functions, venmic does not. this will be resolved in a future PR. --- pkgs/by-name/ve/vesktop/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index dae604d23054..90ec3dd0e44d 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -141,5 +141,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ getchoo Scrumplex vgskye ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; mainProgram = "vencorddesktop"; + broken = stdenv.hostPlatform.isAarch64; }; } From 2b45630e445fb0123c04fd85c68d438ebcaf252e Mon Sep 17 00:00:00 2001 From: seth Date: Sun, 22 Oct 2023 16:10:17 -0400 Subject: [PATCH 4/4] vesktop: use hash instead of sha256 --- pkgs/by-name/ve/vesktop/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index 90ec3dd0e44d..d528fec7563a 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "Vencord"; repo = "Vesktop"; rev = "v${version}"; - sha256 = "sha256-jSGad3qMhAdiGdwomQO6BIyHIbKrGLRGniGrJN97gN8="; + hash = "sha256-jSGad3qMhAdiGdwomQO6BIyHIbKrGLRGniGrJN97gN8="; }; pnpm-deps = stdenvNoCC.mkDerivation {