From f91588a53f3ca901d5a32f067834257fbe7cd5a2 Mon Sep 17 00:00:00 2001
From: Wouter den Breejen <uu@denbreejen.net>
Date: Sat, 27 Oct 2007 13:05:19 +0000
Subject: [PATCH] Updated builder for nvidia drivers

svn path=/nixpkgs/trunk/; revision=9538
---
 pkgs/os-specific/linux/nvidia/builder.sh | 76 ++++++++++++------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia/builder.sh b/pkgs/os-specific/linux/nvidia/builder.sh
index 9d12a5ba134..9ec3428e878 100755
--- a/pkgs/os-specific/linux/nvidia/builder.sh
+++ b/pkgs/os-specific/linux/nvidia/builder.sh
@@ -28,18 +28,18 @@ echo "Copying all files to " $out/lib""
 cp -R * $out
 
 #add extra symlinks in $out
-ln -sf $out/lib/libGLcore.so.$versionNumber $out/lib/libGLcore.so
-ln -sf $out/lib/libGLcore.so.$versionNumber $out/lib/libGLcore.so.1
-ln -sf $out/lib/libGL.so.$versionNumber $out/lib/libGL.so
-ln -sf $out/lib/libGL.so.$versionNumber $out/lib/libGL.so.1
-ln -sf $out/lib/libnvidia-cfg.so.$versionNumber $out/lib/libnvidia-cfg.so.1
-ln -sf $out/lib/libnvidia-tls.so.$versionNumber $out/lib/libnvidia-tls.so.1
-ln -sf $out/X11R6/lib/libXvMCNVIDIA.so.$versionNumber $out/X11R6/lib/libXvMCNVIDIA.so.1
-ln -sf $out/X11R6/lib/libXvMCNVIDIA.so.$versionNumber $out/lib/libXvMCNVIDIA.so.1
-ln -sf $out/X11R6/lib/modules/libnvidia-wfb.so.$versionNumber $out/X11R6/lib/modules/libnvidia-wfb.so.1
-ln -sf $out/X11R6/lib/modules/libnvidia-wfb.so.$versionNumber $out/lib/libnvidia-wfb.so.1
-ln -sf $out/X11R6/lib/modules/extensions/libglx.so.$versionNumber $out/X11R6/lib/modules/extensions/libglx.so.1
-ln -sf $out/X11R6/lib/modules/extensions/libglx.so.$versionNumber $out/lib/libglx.so.1
+ln -snf $out/lib/libGLcore.so.$versionNumber $out/lib/libGLcore.so
+ln -snf $out/lib/libGLcore.so.$versionNumber $out/lib/libGLcore.so.1
+ln -snf $out/lib/libGL.so.$versionNumber $out/lib/libGL.so
+ln -snf $out/lib/libGL.so.$versionNumber $out/lib/libGL.so.1
+ln -snf $out/lib/libnvidia-cfg.so.$versionNumber $out/lib/libnvidia-cfg.so.1
+ln -snf $out/lib/libnvidia-tls.so.$versionNumber $out/lib/libnvidia-tls.so.1
+ln -snf $out/X11R6/lib/libXvMCNVIDIA.so.$versionNumber $out/X11R6/lib/libXvMCNVIDIA.so.1
+ln -snf $out/X11R6/lib/libXvMCNVIDIA.so.$versionNumber $out/lib/libXvMCNVIDIA.so.1
+ln -snf $out/X11R6/lib/modules/libnvidia-wfb.so.$versionNumber $out/X11R6/lib/modules/libnvidia-wfb.so.1
+ln -snf $out/X11R6/lib/modules/libnvidia-wfb.so.$versionNumber $out/lib/libnvidia-wfb.so.1
+ln -snf $out/X11R6/lib/modules/extensions/libglx.so.$versionNumber $out/X11R6/lib/modules/extensions/libglx.so.1
+ln -snf $out/X11R6/lib/modules/extensions/libglx.so.$versionNumber $out/lib/libglx.so.1
 
 #TODO: patchelf binaries !
 #patchelf --set-interpreter ${path glibc TODO  /lib/ld-linux.so.2 $out/bin/....
@@ -48,19 +48,19 @@ ln -sf $out/X11R6/lib/modules/extensions/libglx.so.$versionNumber $out/lib/libgl
 
 ensureDir /usr/lib/
 cd /usr/lib
-ln -sf $out/lib/libGLcore.so.$versionNumber libGLcore.so.1
-ln -sf $out/lib/libGL.la libGL.la
-ln -sf $out/lib/libGL.so.$versionNumber libGL.so.1
-ln -sf $out/lib/libnvidia-cfg.so.$versionNumber libnvidia-cfg.so.1
-ln -sf $out/lib/libnvidia-tls.so.$versionNumber libnvidia-tls.so.1
+ln -snf $out/lib/libGLcore.so.$versionNumber libGLcore.so.1
+ln -snf $out/lib/libGL.la libGL.la
+ln -snf $out/lib/libGL.so.$versionNumber libGL.so.1
+ln -snf $out/lib/libnvidia-cfg.so.$versionNumber libnvidia-cfg.so.1
+ln -snf $out/lib/libnvidia-tls.so.$versionNumber libnvidia-tls.so.1
 ensureDir /usr/lib/tls/
-ln -sf $out/lib/tls/libnvidia-tls.so.$versionNumber /usr/lib/tls/libnvidia-tls.so.1
-ln -sf $out/X11R6/lib/modules/extensions/libglx.so.$versionNumber libglx.so.1
-ln -sf $out/X11R6/lib/modules/libnvidia-wfb.so.$versionNumber libnvidia-wfb.so.1
-ln -sf $out/X11R6/lib/modules/drivers/nvidia_drv.so nvidia_drv.so
-ln -sf $out/X11R6/lib/libXvMCNVIDIA.so.$versionNumber libXvMCNVIDIA.so.1
-ln -sf $out/bin/tls_test_dso.so tls_test_dso.so
-ln -sf $out/src/nv/nvidia.ko nvidia.ko
+ln -snf $out/lib/tls/libnvidia-tls.so.$versionNumber /usr/lib/tls/libnvidia-tls.so.1
+ln -snf $out/X11R6/lib/modules/extensions/libglx.so.$versionNumber libglx.so.1
+ln -snf $out/X11R6/lib/modules/libnvidia-wfb.so.$versionNumber libnvidia-wfb.so.1
+ln -snf $out/X11R6/lib/modules/drivers/nvidia_drv.so nvidia_drv.so
+ln -snf $out/X11R6/lib/libXvMCNVIDIA.so.$versionNumber libXvMCNVIDIA.so.1
+ln -snf $out/bin/tls_test_dso.so tls_test_dso.so
+ln -snf $out/src/nv/nvidia.ko nvidia.ko
 
 echo "YOU! need to add symlinks as root to the libs in the current $xorgOutPath/lib/xorg/modules/extensions/     (especially libglx.so)"
 rwlibs="
@@ -68,23 +68,23 @@ cd $xorgOutPath/lib/xorg/modules/extensions/;
 mv libglx.so libglx.so.org;
 mv libglx.la libglx.la.org;
 mv libGLcore.so libGLcore.so.org;
-ln -sf /usr/lib/libglx.so.1 libglx.so;
-ln -sf /usr/lib/libglx.so.1 libglx.so.1;
-ln -sf /usr/lib/libGLcore.so.1 libGLcore.so;
-ln -sf /usr/lib/libGLcore.so.1 libGLcore.so.1;
-ln -sf /usr/lib/libGL.so.1 libGL.so;
-ln -sf /usr/lib/libGL.so.1 libGL.so.1;
-ln -sf /usr/lib/libglx.la libglx.la;
-ln -sf /usr/lib/libglx.so.1 libglx.so;
-ln -sf /usr/lib/libglx.so.1 libglx.so.1;
-ln -sf /usr/lib/nvidia_drv.so nvidia_drv.so;
+ln -snf /usr/lib/libglx.so.1 libglx.so;
+ln -snf /usr/lib/libglx.so.1 libglx.so.1;
+ln -snf /usr/lib/libGLcore.so.1 libGLcore.so;
+ln -snf /usr/lib/libGLcore.so.1 libGLcore.so.1;
+ln -snf /usr/lib/libGL.so.1 libGL.so;
+ln -snf /usr/lib/libGL.so.1 libGL.so.1;
+ln -snf /usr/lib/libglx.la libglx.la;
+ln -snf /usr/lib/libglx.so.1 libglx.so;
+ln -snf /usr/lib/libglx.so.1 libglx.so.1;
+ln -snf /usr/lib/nvidia_drv.so nvidia_drv.so;
 
-rm /var/run/opengl-driver;
-ln -sf /var/run/opengl-driver $out;
+# rm /var/run/opengl-driver;
+ln -snf /var/run/opengl-driver $out;
 
 kerneldrvnvpath=$kernelOutPath/lib/modules/*-default/kernel/drivers/video/nvidia;
-echo TODO kerneldrvnvpath: \$kerneldrvnvpath
-#ln -sf $out/src/nv/nvidia.ko \$kerneldrvnvpath/nvidia.ko;
+#echo TODO kerneldrvnvpath: \$kerneldrvnvpath
+ln -snf $out/src/nv/nvidia.ko \$kerneldrvnvpath/nvidia.ko;
 "
 #TODO ADD ln -sf is sometimes not strong enough ...