Unverified Commit c475ac32 authored by Sophie Tauchert's avatar Sophie Tauchert
Browse files

chromium: add libglvnd to rpath

This should fix issues like
- https://github.com/NixOS/nixpkgs/pull/249853
- https://github.com/NixOS/nixpkgs/issues/268490
for all chromium and all electron apps under Wayland.
parent 85f1ba3e
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@
, glibc # gconv + locale
# postFixup:
, vulkan-loader
, libglvnd

# Package customization:
, cupsSupport ? true, cups ? null
@@ -479,7 +480,7 @@ let
      # 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"
      patchelf --set-rpath "${lib.makeLibraryPath [ libGL libglvnd vulkan-loader pciutils ]}:$origRpath" "$chromiumBinary"
    '';

    passthru = {