pyrox.dev
Merge pull request #172961 from impl/remove-electron-ld-preload
electron: (mostly) remove dependency on libXss.so
authored by
Pavol Rusnak
and committed by
GitHub
a90ecf78
12b2ab6c
+2
-3
pkgs/development/tools/electron/generic.nix
+2
-3
pkgs/development/tools/electron/generic.nix
···
63
63
electronLibPath = with lib; makeLibraryPath (
64
64
[ libuuid at-spi2-atk at-spi2-core libappindicator-gtk3 ]
65
65
++ optionals (versionAtLeast version "9.0.0") [ libdrm mesa ]
66
+
++ optionals (versionOlder version "10.0.0") [ libXScrnSaver ]
66
67
++ optionals (versionAtLeast version "11.0.0") [ libxkbcommon ]
67
68
++ optionals (versionAtLeast version "12.0.0") [ libxshmfence ]
68
69
++ optionals (versionAtLeast version "17.0.0") [ libglvnd ]
···
95
96
$out/lib/electron/electron \
96
97
${lib.optionalString (lib.versionAtLeast version "15.0.0") "$out/lib/electron/chrome_crashpad_handler" }
97
98
98
-
wrapProgram $out/lib/electron/electron \
99
-
--prefix LD_PRELOAD : ${lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 \
100
-
"''${gappsWrapperArgs[@]}"
99
+
wrapProgram $out/lib/electron/electron "''${gappsWrapperArgs[@]}"
101
100
'';
102
101
};
103
102