diff options
| author | Kiskae <Kiskae@users.noreply.github.com> | 2024-03-03 19:06:52 +0100 |
|---|---|---|
| committer | Kiskae <Kiskae@users.noreply.github.com> | 2024-04-04 22:50:10 +0200 |
| commit | 230e558635d80b333f2558b4863f7f6628c5f3a2 (patch) | |
| tree | 502a7275cbdd857dd7d20ce03c09e517586f0193 /pkgs/development/tools/electron | |
| parent | bb145640a099594032c5e3a4d96f8f259a357afe (diff) | |
electron-*-bin: fix vulkan-loader
Diffstat (limited to 'pkgs/development/tools/electron')
| -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 58b3154a29416..fb2fcdd6cb1f2 100644 --- a/pkgs/development/tools/electron/binary/generic.nix +++ b/pkgs/development/tools/electron/binary/generic.nix @@ -13,6 +13,7 @@ , libxkbcommon , libxshmfence , libGL +, vulkan-loader , alsa-lib , cairo , cups @@ -102,7 +103,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") [ libGL ] + ++ lib.optionals (lib.versionAtLeast version "17.0.0") [ libGL vulkan-loader ] ); linux = { @@ -133,8 +134,12 @@ let # patch libANGLE patchelf \ - --set-rpath "${lib.makeLibraryPath [ libGL pciutils ]}" \ + --set-rpath "${lib.makeLibraryPath [ libGL pciutils vulkan-loader ]}" \ $out/libexec/electron/lib*GL* + + # replace bundled vulkan-loader + rm "$out/libexec/electron/libvulkan.so.1" + ln -s -t "$out/libexec/electron" "${lib.getLib vulkan-loader}/lib/libvulkan.so.1" ''; }; |