From c475ac3248877ce62bca18c659c7e9e2f9ee651e Mon Sep 17 00:00:00 2001 From: Sophie Tauchert Date: Mon, 20 Nov 2023 11:29:59 +0100 Subject: [PATCH] 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. --- pkgs/applications/networking/browsers/chromium/common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 2a686f87d164..b70cdbce44cc 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -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 = {