mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-04-15 05:47:57 +00:00
electron: add speechd to RPATH
This commit is contained in:
parent
280c094f62
commit
92a452733d
@ -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}}"
|
||||
|
@ -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 + ''
|
||||
|
Loading…
Reference in New Issue
Block a user