pyrox.dev
electron-bin: remove atomEnv
+43
-14
pkgs/development/tools/electron/binary/generic.nix
+43
-14
pkgs/development/tools/electron/binary/generic.nix
···
1
-
{ lib, stdenv
1
+
{ lib
2
+
, stdenv
2
3
, libXScrnSaver
3
4
, makeWrapper
4
5
, fetchurl
···
6
7
, glib
7
8
, gtk3
8
9
, unzip
9
-
, atomEnv
10
-
, libuuid
11
10
, at-spi2-atk
12
-
, at-spi2-core
13
11
, libdrm
14
12
, mesa
15
13
, libxkbcommon
16
-
, libappindicator-gtk3
17
14
, libxshmfence
18
15
, libglvnd
19
-
, wayland
16
+
, alsa-lib
17
+
, cairo
18
+
, cups
19
+
, dbus
20
+
, expat
21
+
, gdk-pixbuf
22
+
, nss
23
+
, nspr
24
+
, xorg
25
+
, pango
26
+
, systemd
20
27
}:
21
28
22
29
version: hashes:
···
64
71
passthru.headers = headersFetcher version hashes.headers;
65
72
};
66
73
67
-
electronLibPath = with lib; makeLibraryPath (
68
-
[ libuuid at-spi2-atk at-spi2-core libappindicator-gtk3 wayland ]
69
-
++ optionals (versionAtLeast version "9.0.0") [ libdrm mesa ]
70
-
++ optionals (versionOlder version "10.0.0") [ libXScrnSaver ]
71
-
++ optionals (versionAtLeast version "11.0.0") [ libxkbcommon ]
72
-
++ optionals (versionAtLeast version "12.0.0") [ libxshmfence ]
73
-
++ optionals (versionAtLeast version "17.0.0") [ libglvnd ]
74
+
electronLibPath = lib.makeLibraryPath ([
75
+
alsa-lib
76
+
at-spi2-atk
77
+
cairo
78
+
cups
79
+
dbus
80
+
expat
81
+
gdk-pixbuf
82
+
glib
83
+
gtk3
84
+
nss
85
+
nspr
86
+
xorg.libX11
87
+
xorg.libxcb
88
+
xorg.libXcomposite
89
+
xorg.libXdamage
90
+
xorg.libXext
91
+
xorg.libXfixes
92
+
xorg.libXrandr
93
+
xorg.libxkbfile
94
+
pango
95
+
stdenv.cc.cc.lib
96
+
systemd
97
+
]
98
+
++ lib.optionals (lib.versionAtLeast version "9.0.0") [ libdrm mesa ]
99
+
++ lib.optionals (lib.versionOlder version "10.0.0") [ libXScrnSaver ]
100
+
++ lib.optionals (lib.versionAtLeast version "11.0.0") [ libxkbcommon ]
101
+
++ lib.optionals (lib.versionAtLeast version "12.0.0") [ libxshmfence ]
102
+
++ lib.optionals (lib.versionAtLeast version "17.0.0") [ libglvnd ]
74
103
);
75
104
76
105
linux = {
···
95
124
postFixup = ''
96
125
patchelf \
97
126
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
98
-
--set-rpath "${atomEnv.libPath}:${electronLibPath}:$out/libexec/electron" \
127
+
--set-rpath "${electronLibPath}:$out/libexec/electron" \
99
128
$out/libexec/electron/.electron-wrapped \
100
129
${lib.optionalString (lib.versionAtLeast version "15.0.0") "$out/libexec/electron/.chrome_crashpad_handler-wrapped" }
101
130
'';