fix: betterbird

This commit is contained in:
Jet 2026-05-01 19:18:14 -07:00
parent a2e3c2ca5a
commit 6b42a4c38a
No known key found for this signature in database
2 changed files with 9 additions and 5 deletions

View file

@ -12,7 +12,7 @@ let
"${homeLib.zenStartup}/share/applications/zen-startup.desktop" "${homeLib.zenStartup}/share/applications/zen-startup.desktop"
"${homeLib.ghosttyZellijStartup}/share/applications/ghostty-zellij-startup.desktop" "${homeLib.ghosttyZellijStartup}/share/applications/ghostty-zellij-startup.desktop"
"${pkgs.slack}/share/applications/slack.desktop" "${pkgs.slack}/share/applications/slack.desktop"
"${homeLib.betterbirdStartup}/share/applications/betterbird-startup.desktop" "${homeLib.betterbird}/share/applications/betterbird.desktop"
] ]
else else
[ [
@ -20,7 +20,7 @@ let
"${homeLib.ghosttyZellijStartup}/share/applications/ghostty-zellij-startup.desktop" "${homeLib.ghosttyZellijStartup}/share/applications/ghostty-zellij-startup.desktop"
"${homeLib.signalStartup}/share/applications/signal-startup.desktop" "${homeLib.signalStartup}/share/applications/signal-startup.desktop"
"${pkgs.slack}/share/applications/slack.desktop" "${pkgs.slack}/share/applications/slack.desktop"
"${homeLib.betterbirdStartup}/share/applications/betterbird-startup.desktop" "${homeLib.betterbird}/share/applications/betterbird.desktop"
"${homeLib.vesktopStartup}/share/applications/vesktop-startup.desktop" "${homeLib.vesktopStartup}/share/applications/vesktop-startup.desktop"
"${homeLib.zulipStartup}/share/applications/zulip-startup.desktop" "${homeLib.zulipStartup}/share/applications/zulip-startup.desktop"
]; ];

View file

@ -55,6 +55,7 @@ let
pkgs.autoPatchelfHook pkgs.autoPatchelfHook
pkgs.makeWrapper pkgs.makeWrapper
pkgs.patchelfUnstable pkgs.patchelfUnstable
pkgs.wrapGAppsHook3
]; ];
# Mozilla binaries use relrhack, which breaks if patchelf clobbers sections. # Mozilla binaries use relrhack, which breaks if patchelf clobbers sections.
@ -105,8 +106,10 @@ let
mkdir -p "$out/lib" "$out/bin" "$out/share" mkdir -p "$out/lib" "$out/bin" "$out/share"
cp -r betterbird "$out/lib/betterbird" cp -r betterbird "$out/lib/betterbird"
makeWrapper "$out/lib/betterbird/betterbird" "$out/bin/betterbird" \ ln -s "$out/lib/betterbird/betterbird" "$out/bin/betterbird"
--prefix LD_LIBRARY_PATH : "${pkgs.lib.makeLibraryPath buildInputs}"
gappsWrapperArgs+=(--argv0 "$out/bin/.betterbird-wrapped")
gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${pkgs.lib.makeLibraryPath buildInputs}")
if [ -d "$out/lib/betterbird/chrome/icons/default" ]; then if [ -d "$out/lib/betterbird/chrome/icons/default" ]; then
mkdir -p "$out/share/icons/hicolor/128x128/apps" mkdir -p "$out/share/icons/hicolor/128x128/apps"
@ -124,7 +127,8 @@ let
Icon=betterbird Icon=betterbird
Categories=Network;Email; Categories=Network;Email;
MimeType=x-scheme-handler/mailto;message/rfc822;x-scheme-handler/webcal;x-scheme-handler/webcals; MimeType=x-scheme-handler/mailto;message/rfc822;x-scheme-handler/webcal;x-scheme-handler/webcals;
StartupNotify=true StartupNotify=false
StartupWMClass=eu.betterbird.Betterbird
EOF EOF
runHook postInstall runHook postInstall