nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 00:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #150827 from FliegendeWurst/trilium-0.48.8

Browse Source 
trilium: 0.48.7 -> 0.48.8
This commit is contained in:
Bobby Rong 2021-12-18 18:07:31 +08:00 committed by GitHub
commit 9abc550378
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,16 +19,16 @@ let
maintainers = with maintainers; [ fliegendewurst ]; maintainers = with maintainers; [ fliegendewurst ];
}; };
version = "0.48.7"; version = "0.48.8";
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 = "16clrn89mq2n30hb50y45s6qn5l7n1hj4b124wjxrkmmwpdbjwad"; sha256 = "1dz4wdx3d1pmm3yrvipqa929f6gqilhfc3sp6xcgbn9faypp6qra";
}; };
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 = "18zwplcai4s82pdy3l30862jdl22311qh78anrjz29fm6srx1y9l"; sha256 = "0jp1hj51x5wz27f7739nwwli119pzpskg269cxk4i04xxbhr145j";
}; };
in { in {
@ -40,15 +40,6 @@ in {
src = fetchurl desktopSource; 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 = [ nativeBuildInputs = [
autoPatchelfHook autoPatchelfHook
makeWrapper makeWrapper
@ -61,12 +52,12 @@ in {
runHook preInstall 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/128x128/apps}
cp -r ./* $out/share/trilium cp -r ./* $out/share/trilium
ln -s $out/share/trilium/trilium $out/bin/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 cp ${desktopItem}/share/applications/* $out/share/applications
runHook postInstall runHook postInstall
''; '';