summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2020-08-25 22:31:05 -0700
committerMatt Turner <mattst88@gentoo.org>2020-08-25 22:32:11 -0700
commit4b39ac5d997c6201aa3f3441f3a3dab040b9c281 (patch)
treed5791c4185f323a24975177ff044051082f4c99d /x11-drivers/nvidia-drivers
parentdev-ruby/autoprefixer-rails: add 9.8.6.3 (diff)
downloadgentoo-4b39ac5d997c6201aa3f3441f3a3dab040b9c281.tar.gz
gentoo-4b39ac5d997c6201aa3f3441f3a3dab040b9c281.tar.bz2
gentoo-4b39ac5d997c6201aa3f3441f3a3dab040b9c281.zip
x11-drivers/nvidia-drivers: Fix libdir
Thanks to Ionen Wolkens for noticing the mistake. Bug: https://bugs.gentoo.org/show_bug.cgi?id=713546 Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'x11-drivers/nvidia-drivers')
-rw-r--r--x11-drivers/nvidia-drivers/files/nvidia-390.conf2
-rw-r--r--x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r3.ebuild (renamed from x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r2.ebuild)5
2 files changed, 5 insertions, 2 deletions
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-390.conf b/x11-drivers/nvidia-drivers/files/nvidia-390.conf
index 81dbfc45786e..55c7cc4a5392 100644
--- a/x11-drivers/nvidia-drivers/files/nvidia-390.conf
+++ b/x11-drivers/nvidia-drivers/files/nvidia-390.conf
@@ -3,5 +3,5 @@ Section "OutputClass"
MatchDriver "nvidia-drm"
Driver "nvidia"
Option "AllowEmptyInitialConfiguration"
- ModulePath "/usr/lib/nvidia/xorg"
+ ModulePath "/usr/%LIBDIR%/nvidia/xorg"
EndSection
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r3.ebuild
index 7505e7d936a1..c5edfd1bb9a1 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r3.ebuild
@@ -176,6 +176,9 @@ src_prepare() {
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
+
+ sed "s:%LIBDIR%:$(get_libdir):g" "${FILESDIR}/nvidia-390.conf" \
+ > "${T}/nvidia-390.conf" || die
}
src_compile() {
@@ -345,7 +348,7 @@ src_install() {
doins nvidia_icd.json
insinto /etc/X11/xorg.conf.d
- doins "${FILESDIR}"/nvidia-390.conf
+ doins ${T}/nvidia-390.conf
fi
if use kernel_linux; then