Unverified Commit e6cdd1cc authored by winston's avatar winston
Browse files

fastmail-desktop: remove LD_LIBRARY_PATH and musl dependenciess

parent c7f73397

pkgs/by-name/fa/fastmail-desktop/linux.nix

+5 −13
Original line number Diff line number Diff line
@@ -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";

  };