From 217c69dcd0e49ac9b356fd3be35476d1927b29d7 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 1 Feb 2019 22:25:32 -0600 Subject: [PATCH] trilium: move icon fetch attribute into derivation, un-hoist 'version' --- pkgs/applications/office/trilium/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 0fcf0c1652bd..c09f78cf873b 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -10,8 +10,16 @@ let desktopName = "Trilium Notes"; categories = "Office"; }; + +in stdenv.mkDerivation rec { + name = "trilium-${version}"; 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. # (they did special-case icon.png but we want the scalable svg) # Use the version here to ensure we get any changes. @@ -20,14 +28,6 @@ let 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 = [ autoPatchelfHook