From 2ef304b0ab9a16ab06c349ffbe16a2fb12ed340a Mon Sep 17 00:00:00 2001 From: Finn Behrens Date: Wed, 4 Aug 2021 11:58:29 +0200 Subject: [PATCH] element-desktop: fix wrapper to start under darwin (#132638) Signed-off-by: Finn Behrens --- .../instant-messengers/element/element-desktop.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index a873af6d2ef6..4a43bec09ace 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , makeWrapper, makeDesktopItem, mkYarnPackage , electron, element-web , callPackage @@ -19,6 +19,7 @@ let rev = "v${version}"; sha256 = "sha256-4d2IOngiRcKd4k0jnilAR3Sojkfru3dlqtoBYi3zeLY="; }; + electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron"; in mkYarnPackage rec { name = "element-desktop-${version}"; inherit version src; @@ -66,7 +67,7 @@ in mkYarnPackage rec { ln -s "${desktopItem}/share/applications" "$out/share/applications" # executable wrapper - makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \ + makeWrapper '${electron_exec}' "$out/bin/${executableName}" \ --add-flags "$out/share/element/electron" '';