diff options
| author | Emily <git@emilylange.de> | 2023-10-21 14:00:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-21 14:00:31 +0200 |
| commit | 9ef114e19ac93be290dcca9b576d3f8a91c99d70 (patch) | |
| tree | 2f31f864b2c4bf16d1357f31ae4384fb4143e8cf | |
| parent | c2f9b2e6fb4875ebccd43fee2e62d8e2a3bd453a (diff) | |
| parent | db3731b88799ec90d8ac90f7c85a38aed28ff4d8 (diff) | |
| download | nixpkgs-9ef114e19ac93be290dcca9b576d3f8a91c99d70.tar nixpkgs-9ef114e19ac93be290dcca9b576d3f8a91c99d70.tar.gz nixpkgs-9ef114e19ac93be290dcca9b576d3f8a91c99d70.tar.bz2 nixpkgs-9ef114e19ac93be290dcca9b576d3f8a91c99d70.tar.lz nixpkgs-9ef114e19ac93be290dcca9b576d3f8a91c99d70.tar.xz nixpkgs-9ef114e19ac93be290dcca9b576d3f8a91c99d70.tar.zst nixpkgs-9ef114e19ac93be290dcca9b576d3f8a91c99d70.zip | |
Merge pull request #262145 from nixdrin/chromium-libpci
chromium: fix libpci GPU detection
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 22d71e8975f..72ae7ae6aa4 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -315,9 +315,6 @@ let sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \ device/udev_linux/udev?_loader.cc '' + '' - sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ - gpu/config/gpu_info_collector_linux.cc - # Allow to put extensions into the system-path. sed -i -e 's,/usr,/run/current-system/sw,' chrome/common/chrome_paths.cc @@ -479,9 +476,10 @@ let postFixup = '' # Make sure that libGLESv2 and libvulkan are found by dlopen. + # 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 ]}:$origRpath" "$chromiumBinary" + patchelf --set-rpath "${lib.makeLibraryPath [ libGL vulkan-loader pciutils ]}:$origRpath" "$chromiumBinary" ''; passthru = { |