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