Commit 2c035ca8 authored by Kira Bruneau's avatar Kira Bruneau
Browse files

element-desktop: remove special case for electron on darwin

parent 45a58291

pkgs/applications/networking/instant-messengers/element/element-desktop.nix

+1 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
let

  pinData = lib.importJSON ./pin.json;

  executableName = "element-desktop";

  electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron";

  keytar = callPackage ./keytar { inherit Security AppKit; };

  seshat = callPackage ./seshat { inherit CoreServices; };

in
@@ -83,7 +82,7 @@ mkYarnPackage rec { 


    # executable wrapper

    # LD_PRELOAD workaround for sqlcipher not found: https://github.com/matrix-org/seshat/issues/102

    makeWrapper '${electron_exec}' "$out/bin/${executableName}" \

    makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \

      --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \

      --add-flags "$out/share/element/electron" \

      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"