diff --git a/third_party/nixpkgs/patches/pr131440.patch b/third_party/nixpkgs/patches/pr131440.patch new file mode 100644 index 0000000000..38ead871f4 --- /dev/null +++ b/third_party/nixpkgs/patches/pr131440.patch @@ -0,0 +1,39 @@ +From 51d83077ffbca115265b04853e244179713c6518 Mon Sep 17 00:00:00 2001 +From: Luke Granger-Brown +Date: Sun, 25 Jul 2021 08:53:56 +0100 +Subject: [PATCH] google-chrome: avoid crash under some situations + +If our Chrome derivation is Vulkan enabled, the Chrome GPU process +reliably crashes for me under M92 using the proprietary Nvidia drivers. +This is because the PCI-based GPU detection path fails, and we attempt +to use the Vulkan fallback instead, which then crashes(!!) + +Including libpci allows us to use Angle's +src/gpu_info_util/SystemInfo_libpci.cpp path instead, which doesn't +crash, unlike src/gpu_info_util/SystemInfo_vulkan.cpp. +--- + .../networking/browsers/google-chrome/default.nix | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix +index ec03a77d2680df..61d304becfd8d7 100644 +--- a/pkgs/applications/networking/browsers/google-chrome/default.nix ++++ b/pkgs/applications/networking/browsers/google-chrome/default.nix +@@ -18,7 +18,7 @@ + , systemd + + # Loaded at runtime. +-, libexif ++, libexif, pciutils + + # Additional dependencies according to other distros. + ## Ubuntu +@@ -62,7 +62,7 @@ let + alsa-lib libXdamage libXtst libXrandr libxshmfence expat cups + dbus gdk-pixbuf gcc-unwrapped.lib + systemd +- libexif ++ libexif pciutils + liberation_ttf curl util-linux xdg-utils wget + flac harfbuzz icu libpng opusWithCustomModes snappy speechd + bzip2 libcap at-spi2-atk at-spi2-core diff --git a/third_party/nixpkgs/patches/series b/third_party/nixpkgs/patches/series index 324117f1f0..1f3910cb92 100644 --- a/third_party/nixpkgs/patches/series +++ b/third_party/nixpkgs/patches/series @@ -1,2 +1,3 @@ patch-cherrypy.patch pomerium-fix.patch +pr131440.patch diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix index ec03a77d26..61d304becf 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -18,7 +18,7 @@ , systemd # Loaded at runtime. -, libexif +, libexif, pciutils # Additional dependencies according to other distros. ## Ubuntu @@ -62,7 +62,7 @@ let alsa-lib libXdamage libXtst libXrandr libxshmfence expat cups dbus gdk-pixbuf gcc-unwrapped.lib systemd - libexif + libexif pciutils liberation_ttf curl util-linux xdg-utils wget flac harfbuzz icu libpng opusWithCustomModes snappy speechd bzip2 libcap at-spi2-atk at-spi2-core