cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

schildichat-desktop: remove special case for electron on darwin

Browse source
This commit is contained in:
Kira Bruneau 2022-07-26 22:35:53 -04:00
parent 2c035ca89f
commit 6877e896fc
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix
View file

@ -19,7 +19,6 @@
let let
pinData = lib.importJSON ./pin.json; pinData = lib.importJSON ./pin.json;
executableName = "schildichat-desktop"; executableName = "schildichat-desktop";
electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "schildichat-desktop"; pname = "schildichat-desktop";
@ -88,7 +87,7 @@ stdenv.mkDerivation rec {
done done
# executable wrapper # executable wrapper
makeWrapper '${electron_exec}' "$out/bin/${executableName}" \ makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
--add-flags "$out/share/element/electron" \ --add-flags "$out/share/element/electron" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"