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

Merge pull request #55449 from emmanuelrosa/trilium-gsettings

Browse Source 
trilium: fix missing GSettings schemas
This commit is contained in:
Jörg Thalheim 2019-02-09 10:45:12 +00:00 committed by GitHub
commit 5211cb0ccc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem }:
{ stdenv, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, gtk3, wrapGAppsHook }:
let
description = "Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases.";
@ -32,9 +32,10 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [
autoPatchelfHook
makeWrapper
wrapGAppsHook
];
buildInputs = atomEnv.packages;
buildInputs = [ atomEnv.packages gtk3 ];
installPhase = ''
mkdir -p $out/bin
@ -48,10 +49,9 @@ in stdenv.mkDerivation rec {
cp ${desktopItem}/share/applications/* $out/share/applications
'';
# This "shouldn't" be needed, remove when possible :)
# LD_LIBRARY_PATH "shouldn't" be needed, remove when possible :)
preFixup = ''
wrapProgram $out/bin/trilium --prefix LD_LIBRARY_PATH : "${atomEnv.libPath}"
gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${atomEnv.libPath})
'';
dontStrip = true;