diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2024-02-25 19:33:24 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-25 19:33:24 +0100 |
commit | 576d7037ba59b7c719595b0ad8c5eaf31879f7b0 (patch) | |
tree | 71a5f9a99a2458f0e54b9579b88dfa86bc317d1e | |
parent | e2fc21a87564ca49218d96bfbc062dfa060de888 (diff) | |
parent | 1f09eb4d9e8d52d56ce3a77e14143af3efc4bdbb (diff) |
Merge pull request #285883 from Kiskae/electron/fix-libs
electron_*-bin: fix libGL
-rw-r--r-- | pkgs/development/tools/electron/binary/generic.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix index 8f726b4100004..daa0c81d2e05a 100644 --- a/pkgs/development/tools/electron/binary/generic.nix +++ b/pkgs/development/tools/electron/binary/generic.nix @@ -12,7 +12,7 @@ , mesa , libxkbcommon , libxshmfence -, libglvnd +, libGL , alsa-lib , cairo , cups @@ -102,7 +102,7 @@ let ++ lib.optionals (lib.versionOlder version "10.0.0") [ libXScrnSaver ] ++ lib.optionals (lib.versionAtLeast version "11.0.0") [ libxkbcommon ] ++ 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 = { @@ -130,6 +130,11 @@ let --set-rpath "${electronLibPath}:$out/libexec/electron" \ $out/libexec/electron/.electron-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* ''; }; |