From 92a452733de4e8b4457aeba14fd9dae67411ca57 Mon Sep 17 00:00:00 2001 From: Maximilian Marx Date: Tue, 16 Apr 2024 15:09:02 +0200 Subject: [PATCH] electron: add speechd to RPATH --- pkgs/by-name/ve/vesktop/package.nix | 14 -------------- pkgs/development/tools/electron/common.nix | 2 ++ 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index 17fb994f2ba4..980258ed863a 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -8,15 +8,11 @@ , copyDesktopItems , vencord , electron -, pipewire -, libpulseaudio , libicns -, libnotify , jq , moreutils , cacert , nodePackages -, speechd , withTTS ? true # Enables the use of vencord from nixpkgs instead of # letting vesktop manage it's own version @@ -116,15 +112,6 @@ stdenv.mkDerivation (finalAttrs: { # this is consistent with other nixpkgs electron packages and upstream, as far as I am aware installPhase = - let - # this is mainly required for venmic - libPath = lib.makeLibraryPath ([ - libpulseaudio - libnotify - pipewire - stdenv.cc.cc.lib - ] ++ lib.optional withTTS speechd); - in '' runHook preInstall @@ -139,7 +126,6 @@ stdenv.mkDerivation (finalAttrs: { done makeWrapper ${electron}/bin/electron $out/bin/vesktop \ - --prefix LD_LIBRARY_PATH : ${libPath} \ --add-flags $out/opt/Vesktop/resources/app.asar \ ${lib.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix index caa042b6a772..fc52b0d832c7 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -16,6 +16,7 @@ , pipewire , libsecret , libpulseaudio +, speechd , info }: @@ -200,6 +201,7 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { stdenv.cc.cc.lib libsecret libpulseaudio + speechd ]; in base.postFixup + ''