trilium: move icon fetch attribute into derivation, un-hoist 'version'

This commit is contained in:
Will Dietz 2019-02-01 22:25:32 -06:00
parent ee124b77f3
commit 217c69dcd0

View file

@ -10,8 +10,16 @@ let
desktopName = "Trilium Notes"; desktopName = "Trilium Notes";
categories = "Office"; categories = "Office";
}; };
in stdenv.mkDerivation rec {
name = "trilium-${version}";
version = "0.28.3"; version = "0.28.3";
src = fetchurl {
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. # 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.
@ -20,14 +28,6 @@ let
sha256 = "1rgj7pza20yndfp8n12k93jyprym02hqah36fkk2b3if3kcmwnfg"; sha256 = "1rgj7pza20yndfp8n12k93jyprym02hqah36fkk2b3if3kcmwnfg";
}; };
in stdenv.mkDerivation rec {
name = "trilium-${version}";
inherit version;
src = fetchurl {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
sha256 = "0bg7fzb0drw6692hcskiwwd4d9s9547cqp3m1s4qj0y7ca3wrx8r";
};
nativeBuildInputs = [ nativeBuildInputs = [
autoPatchelfHook autoPatchelfHook