diff options
| author | Lily Foster <lily@lily.flowers> | 2023-11-23 04:59:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-23 10:59:03 +0100 |
| commit | fa094c6dd42f8e62334a146e463e3e4684d405c0 (patch) | |
| tree | a97c7cdecb568d48691fd4ba8a93444b21a90507 /pkgs | |
| parent | 87f2a03d25a77e09f70e89ac454ce2689618aac6 (diff) | |
chromium: add rpath to libGLESv2.so from libANGLE (#269345)
Chromium libANGLE-based GL loading was working by accident before, because the cairo lib pulled in libEGL previously (so dlopen didn't need to search rpath when called in libGLESv2) but no longer does and the rpath needs to be added on both the chromium binary and the libGLESv2.so (and yes both even expect to have pciutils available it seems) Fixes #268490 #269104
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 50e211e0c50d7..249c8b45f3f5c 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -489,11 +489,11 @@ let ''; postFixup = '' - # Make sure that libGLESv2 and libvulkan are found by dlopen. + # Make sure that libGLESv2 and libvulkan are found by dlopen in both chromium binary and ANGLE libGLESv2.so. # libpci (from pciutils) is needed by dlopen in angle/src/gpu_info_util/SystemInfo_libpci.cpp - chromiumBinary="$libExecPath/$packageName" - origRpath="$(patchelf --print-rpath "$chromiumBinary")" - patchelf --set-rpath "${lib.makeLibraryPath [ libGL vulkan-loader pciutils ]}:$origRpath" "$chromiumBinary" + for chromiumBinary in "$libExecPath/$packageName" "$libExecPath/libGLESv2.so"; do + patchelf --set-rpath "${lib.makeLibraryPath [ libGL vulkan-loader pciutils ]}:$(patchelf --print-rpath "$chromiumBinary")" "$chromiumBinary" + done ''; passthru = { |