colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #285883 from Kiskae/electron/fix-libs

Browse Source 
electron_*-bin: fix libGL
This commit is contained in:
Sandro 2024-02-25 19:33:24 +01:00 committed by GitHub
commit 576d7037ba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/tools/electron/binary/generic.nix
View File

@ -12,7 +12,7 @@
, mesa , mesa
, libxkbcommon , libxkbcommon
, libxshmfence , libxshmfence
, libglvnd , libGL
, alsa-lib , alsa-lib
, cairo , cairo
, cups , cups
@ -102,7 +102,7 @@ let
++ lib.optionals (lib.versionOlder version "10.0.0") [ libXScrnSaver ] ++ lib.optionals (lib.versionOlder version "10.0.0") [ libXScrnSaver ]
++ lib.optionals (lib.versionAtLeast version "11.0.0") [ libxkbcommon ] ++ lib.optionals (lib.versionAtLeast version "11.0.0") [ libxkbcommon ]
++ lib.optionals (lib.versionAtLeast version "12.0.0") [ libxshmfence ] ++ lib.optionals (lib.versionAtLeast version "12.0.0") [ libxshmfence ]
++ lib.optionals (lib.versionAtLeast version "17.0.0") [ libglvnd ] ++ lib.optionals (lib.versionAtLeast version "17.0.0") [ libGL ]
); );
linux = { linux = {
@ -130,6 +130,11 @@ let
--set-rpath "${electronLibPath}:$out/libexec/electron" \ --set-rpath "${electronLibPath}:$out/libexec/electron" \
$out/libexec/electron/.electron-wrapped \ $out/libexec/electron/.electron-wrapped \
${lib.optionalString (lib.versionAtLeast version "15.0.0") "$out/libexec/electron/.chrome_crashpad_handler-wrapped" } ${lib.optionalString (lib.versionAtLeast version "15.0.0") "$out/libexec/electron/.chrome_crashpad_handler-wrapped" }
# patch libANGLE
patchelf \
--set-rpath "${lib.makeLibraryPath [ libGL pciutils ]}" \
$out/libexec/electron/lib*GL*
''; '';
}; };