From e6cdd1cc34a7f7ee415242a07faeb8333563a443 Mon Sep 17 00:00:00 2001 From: winston Date: Tue, 24 Mar 2026 12:04:28 +0100 Subject: [PATCH] fastmail-desktop: remove LD_LIBRARY_PATH and musl dependenciess --- pkgs/by-name/fa/fastmail-desktop/linux.nix | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/fa/fastmail-desktop/linux.nix b/pkgs/by-name/fa/fastmail-desktop/linux.nix index ddb70a4632e4..98f354809842 100644 --- a/pkgs/by-name/fa/fastmail-desktop/linux.nix +++ b/pkgs/by-name/fa/fastmail-desktop/linux.nix @@ -4,18 +4,13 @@ src, passthru, meta, - lib, stdenvNoCC, appimageTools, asar, autoPatchelfHook, makeWrapper, electron, - libxscrnsaver, - libxtst, - libappindicator, libgcc, - musl, vips, }: let @@ -37,16 +32,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { buildInputs = [ libgcc - musl vips ]; - libPath = lib.makeLibraryPath [ - libxscrnsaver - libxtst - libappindicator - ]; - installPhase = '' runHook preInstall @@ -71,13 +59,17 @@ stdenvNoCC.mkDerivation (finalAttrs: { makeWrapper "${electron}/bin/electron" "$out/bin/fastmail" \ --add-flags "$out/opt/fastmail/app.asar.unpacked" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-wayland-ime=true --wayland-text-input-version=3}}" \ - --prefix LD_LIBRARY_PATH : ${finalAttrs.libPath}:$out/opt/fastmail \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 runHook postInstall ''; + # remove musl-libc dependencies before the autoPatchelfHook + preFixup = '' + rm -r "$out/opt/fastmail/app.asar.unpacked/node_modules/@img/"{sharp-linuxmusl-x64,sharp-libvips-linuxmusl-x64} + ''; + meta = meta // { mainProgram = "fastmail"; };