Merge pull request #262145 from nixdrin/chromium-libpci

chromium: fix libpci GPU detection

authored by Emily and committed by GitHub 9ef114e1 c2f9b2e6

+2 -4
+2 -4
pkgs/applications/networking/browsers/chromium/common.nix
··· 315 sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \ 316 device/udev_linux/udev?_loader.cc 317 '' + '' 318 - sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ 319 - gpu/config/gpu_info_collector_linux.cc 320 - 321 # Allow to put extensions into the system-path. 322 sed -i -e 's,/usr,/run/current-system/sw,' chrome/common/chrome_paths.cc 323 ··· 479 480 postFixup = '' 481 # Make sure that libGLESv2 and libvulkan are found by dlopen. 482 chromiumBinary="$libExecPath/$packageName" 483 origRpath="$(patchelf --print-rpath "$chromiumBinary")" 484 - patchelf --set-rpath "${lib.makeLibraryPath [ libGL vulkan-loader ]}:$origRpath" "$chromiumBinary" 485 ''; 486 487 passthru = {
··· 315 sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \ 316 device/udev_linux/udev?_loader.cc 317 '' + '' 318 # Allow to put extensions into the system-path. 319 sed -i -e 's,/usr,/run/current-system/sw,' chrome/common/chrome_paths.cc 320 ··· 476 477 postFixup = '' 478 # Make sure that libGLESv2 and libvulkan are found by dlopen. 479 + # libpci (from pciutils) is needed by dlopen in angle/src/gpu_info_util/SystemInfo_libpci.cpp 480 chromiumBinary="$libExecPath/$packageName" 481 origRpath="$(patchelf --print-rpath "$chromiumBinary")" 482 + patchelf --set-rpath "${lib.makeLibraryPath [ libGL vulkan-loader pciutils ]}:$origRpath" "$chromiumBinary" 483 ''; 484 485 passthru = {