diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/office/trilium/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/office/trilium/default.nix | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/applications/office/trilium/default.nix b/nixpkgs/pkgs/applications/office/trilium/default.nix index 00d8bb0d275b..a72332f2f338 100644 --- a/nixpkgs/pkgs/applications/office/trilium/default.nix +++ b/nixpkgs/pkgs/applications/office/trilium/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, p7zip, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem }: +{ stdenv, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, gtk3, wrapGAppsHook }: let description = "Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases."; @@ -13,20 +13,29 @@ let in stdenv.mkDerivation rec { name = "trilium-${version}"; - version = "0.27.4"; + version = "0.28.3"; src = fetchurl { - url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.7z"; - sha256 = "1qb11axaifw5xjycrc6qsyd8h36rgjd7rjql8895v8agckf3g2c1"; + url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; + sha256 = "0bg7fzb0drw6692hcskiwwd4d9s9547cqp3m1s4qj0y7ca3wrx8r"; }; + # 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}/src/public/images/trilium.svg"; + sha256 = "1rgj7pza20yndfp8n12k93jyprym02hqah36fkk2b3if3kcmwnfg"; + }; + + nativeBuildInputs = [ - p7zip /* for unpacking */ autoPatchelfHook makeWrapper + wrapGAppsHook ]; - buildInputs = atomEnv.packages; + buildInputs = [ atomEnv.packages gtk3 ]; installPhase = '' mkdir -p $out/bin @@ -36,14 +45,13 @@ in stdenv.mkDerivation rec { cp -r ./* $out/share/trilium ln -s $out/share/trilium/trilium $out/bin/trilium - ln -s $out/share/trilium/resources/app/src/public/images/trilium.svg $out/share/icons/hicolor/scalable/apps/trilium.svg + ln -s ${trilium_svg} $out/share/icons/hicolor/scalable/apps/trilium.svg cp ${desktopItem}/share/applications/* $out/share/applications ''; - - # This "shouldn't" be needed, remove when possible :) + # LD_LIBRARY_PATH "shouldn't" be needed, remove when possible :) preFixup = '' - wrapProgram $out/bin/trilium --prefix LD_LIBRARY_PATH : "${atomEnv.libPath}" + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${atomEnv.libPath}) ''; dontStrip = true; |