pyrox.dev
trilium: remove atomEnv
+14
-4
pkgs/applications/office/trilium/desktop.nix
+14
-4
pkgs/applications/office/trilium/desktop.nix
···
1
1
{ stdenv, lib, unzip, autoPatchelfHook
2
-
, fetchurl, atomEnv, makeWrapper
3
-
, makeDesktopItem, copyDesktopItems, wrapGAppsHook, libxshmfence
2
+
, fetchurl, makeWrapper
3
+
, alsa-lib, mesa, nss, nspr, systemd
4
+
, makeDesktopItem, copyDesktopItems, wrapGAppsHook
4
5
, metaCommon
5
6
}:
6
7
···
24
25
25
26
src = fetchurl linuxSource;
26
27
28
+
# TODO: migrate off autoPatchelfHook and use nixpkgs' electron
27
29
nativeBuildInputs = [
28
30
autoPatchelfHook
29
31
makeWrapper
···
31
33
copyDesktopItems
32
34
];
33
35
34
-
buildInputs = atomEnv.packages ++ [ libxshmfence ];
36
+
buildInputs = [
37
+
alsa-lib
38
+
mesa
39
+
nss
40
+
nspr
41
+
stdenv.cc.cc
42
+
systemd
43
+
];
35
44
36
45
desktopItems = [
37
46
(makeDesktopItem {
···
64
73
'';
65
74
66
75
# LD_LIBRARY_PATH "shouldn't" be needed, remove when possible :)
76
+
# Error: libstdc++.so.6: cannot open shared object file: No such file or directory
67
77
preFixup = ''
68
-
gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${atomEnv.libPath})
78
+
gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath buildInputs})
69
79
'';
70
80
71
81
dontStrip = true;