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

trilium: Rename package to trilium-desktop

Browse Source
This commit is contained in:
Christian Kampka 2019-12-05 13:52:55 +01:00
parent fa851fd7a8
commit 184339fe8b
No known key found for this signature in database
GPG Key ID: B88E140DB4FE1AA5
2 changed files with 57 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,56 +11,60 @@ let
categories = "Office"; categories = "Office";
}; };
in stdenv.mkDerivation rec {
pname = "trilium";
version = "0.37.8"; version = "0.37.8";
in {
trilium-desktop = stdenv.mkDerivation rec {
pname = "trilium-desktop";
inherit version;
src = fetchurl { src = fetchurl {
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 = "06d88waxxjdnrn0y8qr6p9rf5xkvl5lbabb0xyk0dgy3wg70zlxz"; sha256 = "06d88waxxjdnrn0y8qr6p9rf5xkvl5lbabb0xyk0dgy3wg70zlxz";
}; };
# 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.
trilium_svg = fetchurl { trilium_svg = fetchurl {
url = "https://raw.githubusercontent.com/zadam/trilium/v${version}/src/public/images/trilium.svg"; url = "https://raw.githubusercontent.com/zadam/trilium/v${version}/src/public/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;
meta = with stdenv.lib; { meta = with stdenv.lib; {
inherit description; inherit description;
homepage = https://github.com/zadam/trilium; homepage = https://github.com/zadam/trilium;
license = licenses.agpl3; license = licenses.agpl3;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ emmanuelrosa dtzWill ]; maintainers = with maintainers; [ emmanuelrosa dtzWill ];
};
}; };
} }

5
pkgs/top-level/all-packages.nix
View File

@ -6808,7 +6808,10 @@ in
triggerhappy = callPackage ../tools/inputmethods/triggerhappy {}; triggerhappy = callPackage ../tools/inputmethods/triggerhappy {};
trilium = callPackage ../applications/office/trilium { }; inherit (callPackage ../applications/office/trilium {})
trilium-desktop
;
trilium = trilium-desktop;
trousers = callPackage ../tools/security/trousers { }; trousers = callPackage ../tools/security/trousers { };