diff options
| author | Lenard Spencer <lenardrspencer@gmail.com> | 2023-03-06 22:53:37 +0000 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2023-03-12 08:48:33 +0700 |
| commit | dff407baf6f68336eeac538ae244a04194c1d005 (patch) | |
| tree | 3700c625c24cbd29085388ee2a4ce73067782769 | |
| parent | 88ef15b9b0952e059bffe72f06a3f05a22f11c68 (diff) | |
system/nvidia-legacy470-driver: Fix runlevel 4 SDDM login.
Signed-off-by: bedlam <dave@slackbuilds.org>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | system/nvidia-legacy470-driver/nvidia-legacy470-driver.SlackBuild | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/system/nvidia-legacy470-driver/nvidia-legacy470-driver.SlackBuild b/system/nvidia-legacy470-driver/nvidia-legacy470-driver.SlackBuild index 34602c1c0d8f..b025d38467a3 100644 --- a/system/nvidia-legacy470-driver/nvidia-legacy470-driver.SlackBuild +++ b/system/nvidia-legacy470-driver/nvidia-legacy470-driver.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=nvidia-legacy470-driver VERSION=${VERSION:-470.161.03} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -57,11 +57,9 @@ else exit 1 fi -if [ "${COMPAT32}" = "yes" ]; then - COMP32="--install-compat32-libs --compat32-prefix=$PKG/usr" +if [ "$COMPAT32" = "yes" ]; then MULTI="_multilib" else - COMP32="--no-install-compat32-libs" MULTI="" fi @@ -142,6 +140,17 @@ cd - mv -f $PKG/usr/bin/nvidia-installer $TMP/$SRCNAM mv -f $PKG/usr/man/man1/nvidia-installer.1.gz $TMP/$SRCNAM +if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then + COMP32="--install-compat32-libs --compat32-prefix=$PKG/usr" + mkdir -p $PKG/usr/lib +else + if [ ! "$ARCH" = "x86_64" ]; then + COMP32="" + else + COMP32="--no-install-compat32-libs" + fi +fi + # Install the binary libs using nvidia-installer compiled above cd $TMP/$SRCNAM ./nvidia-installer -s --no-kernel-module --no-drm --no-unified-memory \ @@ -181,7 +190,8 @@ fi # remove a pair of folders installed and used by nvidia-installer but # no longer needed (caused the "failed to remove some directories" # warning message): -rm -rf $PKG/{var,usr}/lib/nvidia || true +rm -rf $PKG/usr/lib/nvidia || true +rm -rf $PKG/var/lib || true # Compile utilites from source, replacing the precompiled versions # @@ -323,4 +333,4 @@ fi # Flag multlib as needed and build package. cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION$MULTI-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} |