diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 0f07dd0efd3e..8782b2288e68 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -19,16 +19,16 @@ let maintainers = with maintainers; [ fliegendewurst ]; }; - version = "0.48.7"; + version = "0.48.8"; desktopSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "16clrn89mq2n30hb50y45s6qn5l7n1hj4b124wjxrkmmwpdbjwad"; + sha256 = "1dz4wdx3d1pmm3yrvipqa929f6gqilhfc3sp6xcgbn9faypp6qra"; }; serverSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - sha256 = "18zwplcai4s82pdy3l30862jdl22311qh78anrjz29fm6srx1y9l"; + sha256 = "0jp1hj51x5wz27f7739nwwli119pzpskg269cxk4i04xxbhr145j"; }; in { @@ -40,15 +40,6 @@ in { src = fetchurl desktopSource; - # Fetch from source repo, no longer included in release. - # (they did special-case icon.png but we want the scalable svg) - # Use the version here to ensure we get any changes. - trilium_svg = fetchurl { - url = "https://raw.githubusercontent.com/zadam/trilium/v${version}/images/icon.svg"; - sha256 = "0sz3piskdlx267whx8r6afrdadn25bf0zmxplj1599zqkf7w7n0x"; - }; - - nativeBuildInputs = [ autoPatchelfHook makeWrapper @@ -61,12 +52,12 @@ in { runHook preInstall mkdir -p $out/bin mkdir -p $out/share/trilium - mkdir -p $out/share/{applications,icons/hicolor/scalable/apps} + mkdir -p $out/share/{applications,icons/hicolor/128x128/apps} cp -r ./* $out/share/trilium ln -s $out/share/trilium/trilium $out/bin/trilium - ln -s ${trilium_svg} $out/share/icons/hicolor/scalable/apps/trilium.svg + ln -s $out/share/trilium/icon.png $out/share/icons/hicolor/128x128/apps/trilium.png cp ${desktopItem}/share/applications/* $out/share/applications runHook postInstall '';