diff options
| author | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2024-04-29 22:49:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-29 22:49:20 +0200 |
| commit | 64a883feecfe03b8d40c691723369503c38f006e (patch) | |
| tree | 76e70648b604a96f3b1a4e44ecc23deb40fab467 /pkgs/by-name/ve/vesktop/package.nix | |
| parent | e5f98f9c68c173f0756c57220fad559159793c13 (diff) | |
| parent | 1c6fe6529621c8b27194e9a1e110b573ec202e9a (diff) | |
Merge pull request #306421 from mmarx/fix-vesktop
Patch RPATH for pre-built node modules in vesktop, terra-station, standardnotes, and logseq
Diffstat (limited to 'pkgs/by-name/ve/vesktop/package.nix')
| -rw-r--r-- | pkgs/by-name/ve/vesktop/package.nix | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index d3952f621a123..a3a8677e0886e 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -13,6 +13,9 @@ , moreutils , cacert , nodePackages +, pipewire +, libpulseaudio +, autoPatchelfHook , withTTS ? true # Enables the use of vencord from nixpkgs instead of # letting vesktop manage it's own version @@ -81,6 +84,13 @@ stdenv.mkDerivation (finalAttrs: { nodePackages.pnpm nodePackages.nodejs makeWrapper + autoPatchelfHook + ]; + + buildInputs = [ + pipewire + libpulseaudio + stdenv.cc.cc.lib ]; patches = [ @@ -106,6 +116,7 @@ stdenv.mkDerivation (finalAttrs: { # using `pnpm exec` here apparently makes it ignore ELECTRON_SKIP_BINARY_DOWNLOAD ./node_modules/.bin/electron-builder \ --dir \ + -c.asarUnpack="**/*.node" \ -c.electronDist=${electron}/libexec/electron \ -c.electronVersion=${electron.version} ''; @@ -115,8 +126,8 @@ stdenv.mkDerivation (finalAttrs: { '' runHook preInstall - mkdir -p $out/opt/Vesktop/resources - cp dist/linux-*unpacked/resources/app.asar $out/opt/Vesktop/resources + mkdir -p $out/opt/Vesktop + cp -r dist/linux-*unpacked/resources $out/opt/Vesktop/ pushd build ${libicns}/bin/icns2png -x icon.icns |