public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #117256 from FliegendeWurst/trilium-update-0.46.5

Browse Source 
trilium: 0.45.10 -> 0.46.5
This commit is contained in:
Sandro 2021-03-23 15:47:14 +01:00 committed by GitHub
commit b9d92a1329
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/office/trilium/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, nixosTests, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, gtk3, wrapGAppsHook, zlib, libxkbfile }: { lib, stdenv, nixosTests, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, gtk3, wrapGAppsHook }:
let let
description = "Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases"; description = "Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases";
@ -19,16 +19,16 @@ let
maintainers = with maintainers; [ fliegendewurst ]; maintainers = with maintainers; [ fliegendewurst ];
}; };
version = "0.45.10"; version = "0.46.5";
desktopSource = { desktopSource = {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
sha256 = "06ykgcak7l3q812c4xrp720db3yq0v2lkrzkmwchlwp5rpwhqpck"; sha256 = "157yp8375aviy77i42s7wdzc5igs7ll3v6vjzy30l8i5zis7hry2";
}; };
serverSource = { serverSource = {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
sha256 = "1252zgyb23vfvy63cqd8jdjbm4w9ddwnp32z5vf1fqvd2rrz6lz9"; sha256 = "0bc1p99hr12pj94z48wwdbiw4cwpq3sanxaadbc8vxiyb4mcv706";
}; };
in { in {
@ -58,6 +58,7 @@ in {
buildInputs = atomEnv.packages ++ [ gtk3 ]; buildInputs = atomEnv.packages ++ [ gtk3 ];
installPhase = '' installPhase = ''
runHook preInstall
mkdir -p $out/bin mkdir -p $out/bin
mkdir -p $out/share/trilium mkdir -p $out/share/trilium
mkdir -p $out/share/{applications,icons/hicolor/scalable/apps} mkdir -p $out/share/{applications,icons/hicolor/scalable/apps}
@ -67,6 +68,7 @@ in {
ln -s ${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 cp ${desktopItem}/share/applications/* $out/share/applications
runHook postInstall
''; '';
# LD_LIBRARY_PATH "shouldn't" be needed, remove when possible :) # LD_LIBRARY_PATH "shouldn't" be needed, remove when possible :)
@ -91,8 +93,6 @@ in {
buildInputs = [ buildInputs = [
stdenv.cc.cc.lib stdenv.cc.cc.lib
zlib
libxkbfile
]; ];
patches = [ patches = [