diff options
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/electron/binary/generic.nix | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 4bd6e358fdf6c..54697febefe32 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -479,6 +479,10 @@ let for chromiumBinary in "$libExecPath/$packageName" "$libExecPath/libGLESv2.so"; do patchelf --set-rpath "${lib.makeLibraryPath [ libGL vulkan-loader pciutils ]}:$(patchelf --print-rpath "$chromiumBinary")" "$chromiumBinary" done + + # replace bundled vulkan-loader + rm "$libExecPath/libvulkan.so.1" + ln -s -t "$libExecPath" "${lib.getLib vulkan-loader}/lib/libvulkan.so.1" ''; passthru = { 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" ''; }; |