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

trilium: 0.43.2 -> 0.43.3

Browse Source
This commit is contained in:
Christian Kampka 2020-08-03 10:32:27 +02:00 committed by Alyssa Ross
parent c3035001a5
commit 3331f45cf8
1 changed files with 13 additions and 13 deletions

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

@ -19,27 +19,27 @@ let
maintainers = with maintainers; [ emmanuelrosa dtzWill kampka ]; maintainers = with maintainers; [ emmanuelrosa dtzWill kampka ];
}; };
version = "0.43.2"; version = "0.43.3";
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 = "0q04brfiwllyxh99k8rhx6q3kysj9vl67dj2yvl5bkm8lf5x2l2g"; sha256 = "1k9vcs7pwa89bzivqp0gfs45jzqw216fpypg3ja4n2dzn4qkv2as";
}; };
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 = "1993765gi8c890vf5ljrvfhc1bqmsdy58ksblzz08dwdj44frry5"; sha256 = "1n3v7wdav6mvgcy72mmfhncsa74i0ax1ij5rjczgfjjyiyc5y0rk";
}; };
in { in {
trilium-desktop = stdenv.mkDerivation rec { trilium-desktop = stdenv.mkDerivation rec {
pname = "trilium-desktop"; pname = "trilium-desktop";
inherit version; inherit version;
inherit meta; inherit meta;
src = fetchurl desktopSource; src = fetchurl desktopSource;
# Fetch from source repo, no longer included in release. # Fetch from source repo, no longer included in release.
# (they did special-case icon.png but we want the scalable svg) # (they did special-case icon.png but we want the scalable svg)
# Use the version here to ensure we get any changes. # Use the version here to ensure we get any changes.
@ -47,33 +47,33 @@ in {
url = "https://raw.githubusercontent.com/zadam/trilium/v${version}/images/trilium.svg"; url = "https://raw.githubusercontent.com/zadam/trilium/v${version}/images/trilium.svg";
sha256 = "1rgj7pza20yndfp8n12k93jyprym02hqah36fkk2b3if3kcmwnfg"; sha256 = "1rgj7pza20yndfp8n12k93jyprym02hqah36fkk2b3if3kcmwnfg";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
autoPatchelfHook autoPatchelfHook
makeWrapper makeWrapper
wrapGAppsHook wrapGAppsHook
]; ];
buildInputs = atomEnv.packages ++ [ gtk3 ]; buildInputs = atomEnv.packages ++ [ gtk3 ];
installPhase = '' installPhase = ''
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}
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 ${trilium_svg} $out/share/icons/hicolor/scalable/apps/trilium.svg
cp ${desktopItem}/share/applications/* $out/share/applications cp ${desktopItem}/share/applications/* $out/share/applications
''; '';
# LD_LIBRARY_PATH "shouldn't" be needed, remove when possible :) # LD_LIBRARY_PATH "shouldn't" be needed, remove when possible :)
preFixup = '' preFixup = ''
gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${atomEnv.libPath}) gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${atomEnv.libPath})
''; '';
dontStrip = true; dontStrip = true;
}; };