summaryrefslogtreecommitdiffstats
path: root/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild
diff options
context:
space:
mode:
author Matteo Bernardini2020-03-21 11:50:32 +0100
committer Matteo Bernardini2020-03-21 11:50:32 +0100
commit296746ee2c9b89a5b04f160cf22d7f9227330c05 (patch)
tree9813ea75d1309877871a37e478e166931812353e /system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild
parentf846eb1bcc13a8369ba70a1efd953b9140e56c2f (diff)
downloadslackbuilds-296746ee2c9b89a5b04f160cf22d7f9227330c05.tar.gz
20200321.1 global branch merge.current-20200321.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild')
-rw-r--r--system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild11
1 files changed, 1 insertions, 10 deletions
diff --git a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild
index 8ceef4ab81..cf7de86bbc 100644
--- a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild
+++ b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild
@@ -278,26 +278,18 @@ else
fi
# These add or correct wrong paths
-sed -i "s|$TMP/package-$PRGNAM/usr|/usr|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la
-sed -i "s|/usr/X11R6/lib|/usr/lib$LIBDIRSUFFIX|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la
sed -i "s|__UTILS_PATH__|/usr/bin|" $PKG/usr/share/applications/nvidia-settings.desktop
sed -i "s|__PIXMAP_PATH__|/usr/share/pixmaps|" $PKG/usr/share/applications/nvidia-settings.desktop
sed -i "s|__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__|Application;Settings;|" $PKG/usr/share/applications/nvidia-settings.desktop
-if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
- sed -i "s|$TMP/package-$PRGNAM/usr|/usr|" $PKG/usr/lib/libGL.la
- sed -i "s|/usr/X11R6/lib|/usr/lib|" $PKG/usr/lib/libGL.la
- sed -i "s|'/usr/'|'/usr/lib'|" $PKG/usr/lib/libGL.la
-fi
-
# rename wrong/conficting files as needed; remove conflicting symlinks created by installer
cd $PKG/usr/lib$LIBDIRSUFFIX
if [ "$GLVND" = "yes" ]; then
mv libEGL.so.1.1.0 libEGL.so.1.1.0-nvidia
fi
- mv libGL.la libGL.la-nvidia
mv libGLESv1_CM.so.1.2.0 libGLESv1_CM.so.1.2.0-nvidia
mv libGLESv2.so.2.1.0 libGLESv2.so.2.1.0-nvidia
+ rm -f libGL.la
rm -f libEGL.so
rm -f libGL.so
rm -f libGL.so.1
@@ -312,7 +304,6 @@ if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
if [ "$GLVND" = "yes" ]; then
mv libEGL.so.1.1.0 libEGL.so.1.1.0-nvidia
fi
- mv libGL.la libGL.la-nvidia
mv libGLESv1_CM.so.1.2.0 libGLESv1_CM.so.1.2.0-nvidia
mv libGLESv2.so.2.1.0 libGLESv2.so.2.1.0-nvidia
rm -f libEGL.so