cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #172961 from impl/remove-electron-ld-preload

Browse source 
electron: (mostly) remove dependency on libXss.so
This commit is contained in:
Pavol Rusnak 2022-05-15 19:50:22 +02:00 committed by GitHub
commit a90ecf7856
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/tools/electron/generic.nix
View file

@ -63,6 +63,7 @@ let
electronLibPath = with lib; makeLibraryPath ( electronLibPath = with lib; makeLibraryPath (
[ libuuid at-spi2-atk at-spi2-core libappindicator-gtk3 ] [ libuuid at-spi2-atk at-spi2-core libappindicator-gtk3 ]
++ optionals (versionAtLeast version "9.0.0") [ libdrm mesa ] ++ optionals (versionAtLeast version "9.0.0") [ libdrm mesa ]
++ optionals (versionOlder version "10.0.0") [ libXScrnSaver ]
++ optionals (versionAtLeast version "11.0.0") [ libxkbcommon ] ++ optionals (versionAtLeast version "11.0.0") [ libxkbcommon ]
++ optionals (versionAtLeast version "12.0.0") [ libxshmfence ] ++ optionals (versionAtLeast version "12.0.0") [ libxshmfence ]
++ optionals (versionAtLeast version "17.0.0") [ libglvnd ] ++ optionals (versionAtLeast version "17.0.0") [ libglvnd ]
@ -95,9 +96,7 @@ let
$out/lib/electron/electron \ $out/lib/electron/electron \
${lib.optionalString (lib.versionAtLeast version "15.0.0") "$out/lib/electron/chrome_crashpad_handler" } ${lib.optionalString (lib.versionAtLeast version "15.0.0") "$out/lib/electron/chrome_crashpad_handler" }
wrapProgram $out/lib/electron/electron \ wrapProgram $out/lib/electron/electron "''${gappsWrapperArgs[@]}"
--prefix LD_PRELOAD : ${lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 \
"''${gappsWrapperArgs[@]}"
''; '';
}; };