Unverified Commit aa28e182 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

fastmail-desktop: 1.1.0 -> 1.2.1 (#503002)

parents ffb2933d e6cdd1cc
Loading
Loading
Loading
Loading
+8 −16
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

@@ -55,29 +43,33 @@ stdenvNoCC.mkDerivation (finalAttrs: {
    asar extract "$out/opt/fastmail/app.asar" "$out/opt/fastmail/app.asar.unpacked"
    rm "$out/opt/fastmail/app.asar"

    install -D "${appimageContents}/production.desktop" "$out/share/applications/fastmail.desktop"
    install -Dt "$out/share/applications" "${appimageContents}/fastmail.desktop"
    substituteInPlace "$out/share/applications/fastmail.desktop" \
      --replace-fail "Exec=AppRun --no-sandbox %U" "Exec=fastmail %U" \
      --replace-fail "Icon=production" "Icon=fastmail" \
      --replace-fail "Name=com.fastmail.Fastmail" "Name=Fastmail"

    for res in 16 24 32 48 64 128 256 512 1024; do
      resdir="''${res}x''${res}"
      mkdir -p "$out/share/icons/hicolor/$resdir/apps"
      cp -r --no-preserve=mode \
        "${appimageContents}/usr/share/icons/hicolor/$resdir/apps/production.png" \
        "${appimageContents}/usr/share/icons/hicolor/$resdir/apps/fastmail.png" \
        "$out/share/icons/hicolor/$resdir/apps/fastmail.png"
    done

    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";
  };
+7 −7
Original line number Diff line number Diff line
# Generated by ./update.sh - do not update manually!
# Last updated: 2026-02-26
# Last updated: 2026-03-23
{ fetchurl, fetchzip }:
{
  aarch64-darwin = {
    version = "1.1.0";
    version = "1.2.1";
    src = fetchurl {
      url = "https://dl.fastmailcdn.com/desktop/production/mac/arm64/Fastmail-1.1.0-arm64-mac.zip";
      hash = "sha512-z1iW4DnPKY3b1SnIvmgsA62unqMR8nLJpql0jbMuHxyAxWntAZZjpxY0GhmwmZl/WjaCn2SeXj0iYlTJTecZjQ==";
      url = "https://dl.fastmailcdn.com/desktop/production/mac/arm64/Fastmail-1.2.1-arm64-mac.zip";
      hash = "sha512-bu6IeL8X8ogD1qSlAuApWTBTCYIk5QrjWrzjOv8fel+kqYfCIcDXP1DP1FdJwULe91zoZn4M/uDX8CoOPWa0cA==";
    };
  };
  x86_64-linux = {
    version = "1.1.0";
    version = "1.2.1";
    src = fetchurl {
      url = "https://dl.fastmailcdn.com/desktop/production/linux/x64/Fastmail-1.1.0.AppImage";
      hash = "sha512-lXvgZ61M1Ex7jJzFjfC9rYLodGojrbca/t4IOaQ7k/CDI4DyFRDkAGqkGioq7EwzbooS9zTO3fbdYmbOyODFTQ==";
      url = "https://dl.fastmailcdn.com/desktop/production/linux/x64/com.fastmail.Fastmail-1.2.1.AppImage";
      hash = "sha512-xudOPNjOaumYxD7yZyjQnYhuiKqDO10cBwMdFJtVEOfHVia0jJMgdUTJx03otIBn9ijM3/1Qo6wsq1HF0A/zlQ==";
    };
  };
}