From c7ead8f365a5c65dd993d72aa83084aab5045943 Mon Sep 17 00:00:00 2001 From: colin Date: Sat, 4 Jun 2022 15:50:03 -0700 Subject: [PATCH] tidy up the whalebird package draws inspiration from /pkgs/applications/networking/instant-messengers/element/element-desktop.nix enables some wayland-specific flags, which hopefully enables input and removes the mesa opengl restriction? --- pkgs/whalebird/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/whalebird/default.nix b/pkgs/whalebird/default.nix index 64995848..10988a14 100644 --- a/pkgs/whalebird/default.nix +++ b/pkgs/whalebird/default.nix @@ -64,14 +64,19 @@ stdenv.mkDerivation rec { mkdir $out mv opt $out - # install icon/desktop files - mkdir -p "$out/share/icons/hicolor/256x256/apps" - cp "$out/opt/Whalebird/resources/build/icons/256x256.png" "$out/share/icons/hicolor/256x256/apps/whalebird.png" - mkdir -p "$out/share/applications" - cp "${desktopItem}/share/applications/whalebird.desktop" "$out/share/applications/whalebird.desktop" + # install icons + for icon in $out/opt/Whalebird/resources/build/icons/*.png; do + mkdir -p "$out/share/icons/hicolor/$(basename $icon .png)/apps" + ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png)/apps/whalebird.png" + done + + # install desktop item + mkdir -p "$out/share" + ln -s "${desktopItem}/share/applications" "$out/share/applications" makeWrapper ${electron}/bin/electron $out/bin/whalebird \ - --add-flags $out/opt/Whalebird/resources/app.asar + --add-flags $out/opt/Whalebird/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" runHook postInstall '';