colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

element-desktop: do not set LD_LIBRARY_PATH

Browse Source 
libnotify is now included in electron's RPATH, so we can avoid setting
LD_LIBRARY_PATH here.
This commit is contained in:
Maximilian Marx 2024-04-15 11:22:07 +02:00
parent 461a23c756
commit d6cc760223
No known key found for this signature in database
GPG Key ID: D981CA0FF602751D
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/networking/instant-messengers/element/element-desktop.nix
View File

@ -16,7 +16,6 @@
, AppKit , AppKit
, CoreServices , CoreServices
, desktopToDarwinBundle , desktopToDarwinBundle
, libnotify
, useKeytar ? true , useKeytar ? true
}: }:
@ -79,11 +78,6 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // {
''; '';
installPhase = installPhase =
let
libPath = lib.makeLibraryPath [
libnotify
];
in
'' ''
runHook preInstall runHook preInstall
@ -111,7 +105,6 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // {
# LD_PRELOAD workaround for sqlcipher not found: https://github.com/matrix-org/seshat/issues/102 # LD_PRELOAD workaround for sqlcipher not found: https://github.com/matrix-org/seshat/issues/102
makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \ makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
--set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \ --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \
--set LD_LIBRARY_PATH "${libPath}" \
--add-flags "$out/share/element/electron" \ --add-flags "$out/share/element/electron" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"