Unverified Commit d6cc7602 authored by Maximilian Marx's avatar Maximilian Marx
Browse files

element-desktop: do not set LD_LIBRARY_PATH

libnotify is now included in electron's RPATH, so we can avoid setting
LD_LIBRARY_PATH here.
parent 461a23c7
Loading
Loading
Loading
Loading
+0 −7
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@
, AppKit
, CoreServices
, desktopToDarwinBundle
, libnotify
, useKeytar ? true
}:

@@ -79,11 +78,6 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // {
  '';

  installPhase =
    let
      libPath = lib.makeLibraryPath [
        libnotify
      ];
    in
  ''
    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
    makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
      --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \
      --set LD_LIBRARY_PATH "${libPath}" \
      --add-flags "$out/share/element/electron" \
      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"