--- /usr/portage/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r2.ebuild	2020-03-17 18:31:12.426447691 +0100
+++ nvidia-drivers-390.132-r2.ebuild	2020-03-22 09:48:09.399574792 +0100
@@ -171,10 +171,14 @@
 
 	if ! [ -f nvidia_icd.json ]; then
 		cp nvidia_icd.json.template nvidia_icd.json || die
 		sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json || die
 	fi
+
+	echo 'Section "Files"' > nvidia-glx.conf
+	echo "	ModulePath \"/usr/$(get_libdir)/extensions/nvidia,/usr/$(get_libdir)/xorg/modules\"" >> nvidia-glx.conf
+	echo 'EndSection' >> nvidia-glx.conf
 }
 
 src_compile() {
 	# This is already the default on Linux, as there's no toplevel Makefile, but
 	# on FreeBSD there's one and triggers the kernel module build, as we install
@@ -313,10 +317,13 @@
 		# Xorg nvidia.conf
 		if has_version '>=x11-base/xorg-server-1.16'; then
 			insinto /usr/share/X11/xorg.conf.d
 			newins {,50-}nvidia-drm-outputclass.conf
 		fi
+		if use libglvnd; then
+			newins {,10-}nvidia-glx.conf
+		fi
 
 		insinto /usr/share/glvnd/egl_vendor.d
 		doins ${NV_X11}/10_nvidia.json
 	fi