linuxPackages.nvidia_x11: refactor, build more from source

* Use libglvnd;
* Compile nvidia-settings, nvidia-persistenced from source;
* Generalize builder.

1 files changed, 52 insertions, 72 deletions

diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index b739fde15f74..98858c4c9851 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -1,17 +1,19 @@
 source $stdenv/setup
 
-dontPatchELF=1 # must keep libXv, $out in RPATH
-
-
-unpackFile() {
+unpackManually() {
     skip=$(sed 's/^skip=//; t; d' $src)
     tail -n +$skip $src | xz -d | tar xvf -
     sourceRoot=.
 }
 
 
+unpackFile() {
+    sh $src -x || unpackManually
+}
+
+
 buildPhase() {
-    if test -z "$libsOnly"; then
+    if [ -n "$bin" ]; then
         # Create the module.
         echo "Building linux driver against kernel: $kernel";
         cd kernel
@@ -25,45 +27,55 @@ buildPhase() {
     fi
 }
 
-
+    
 installPhase() {
     # Install libGL and friends.
-    mkdir -p "$out/etc/OpenCL/vendors"
-    cp -p nvidia.icd $out/etc/OpenCL/vendors/
-
-    mkdir -p "$out/share/vulkan/icd.d"
-    cp -p nvidia_icd.json "$out/share/vulkan/icd.d/"
-
     mkdir -p "$out/lib"
     cp -prd *.so.* tls "$out/lib/"
-    rm "$out"/lib/lib{glx,nvidia-wfb}.so.* # handled separately
+    rm $out/lib/lib{glx,nvidia-wfb}.so.* # handled separately
+    rm -f $out/lib/libnvidia-gtk* # built from source
+    if [ "$useGLVND" = "1" ]; then
+        # Pre-built libglvnd
+        rm $out/lib/lib{GL,GLX,EGL,GLESv1_CM,GLESv2,OpenGL,GLdispatch}.so.*
+    fi
+    # Use ocl-icd instead
+    rm $out/lib/libOpenCL.so*
+    # Move VDPAU libraries to their place
+    mkdir $out/lib/vdpau
+    mv $out/lib/libvdpau* $out/lib/vdpau
 
-    rm $out/lib/libGL.so.1.* # GLVND
-    rm $out/lib/libOpenCL.so* # ocl-icd is used instead
+    # Install ICDs.
+    install -Dm644 nvidia.icd $out/etc/OpenCL/vendors/nvidia.icd
+    if [ -e nvidia_icd.json ]; then
+        install -Dm644 nvidia_icd.json $out/share/vulkan/icd.d/nvidia.json
+    fi
+    if [ "$useGLVND" = "1" ]; then
+        install -Dm644 10_nvidia.json $out/share/glvnd/egl_vendor.d/nvidia.json
+    fi
 
-    if test -z "$libsOnly"; then
+    if [ -n "$bin" ]; then
         # Install the X drivers.
-        mkdir -p $out/lib/xorg/modules
-        cp -p libnvidia-wfb.* $out/lib/xorg/modules/
-        mkdir -p $out/lib/xorg/modules/drivers
-        cp -p nvidia_drv.so $out/lib/xorg/modules/drivers
-        mkdir -p $out/lib/xorg/modules/extensions
-        cp -p libglx.so.* $out/lib/xorg/modules/extensions
+        mkdir -p $bin/lib/xorg/modules
+        cp -p libnvidia-wfb.* $bin/lib/xorg/modules/
+        mkdir -p $bin/lib/xorg/modules/drivers
+        cp -p nvidia_drv.so $bin/lib/xorg/modules/drivers
+        mkdir -p $bin/lib/xorg/modules/extensions
+        cp -p libglx.so.* $bin/lib/xorg/modules/extensions
 
         # Install the kernel module.
-        mkdir -p $out/lib/modules/$kernelVersion/misc
+        mkdir -p $bin/lib/modules/$kernelVersion/misc
         for i in $(find ./kernel -name '*.ko'); do
             nuke-refs $i
-            cp $i $out/lib/modules/$kernelVersion/misc/
+            cp $i $bin/lib/modules/$kernelVersion/misc/
         done
     fi
 
-    # All libs except GUI-only are in $out now, so fixup them.
-    for libname in `find "$out/lib/" -name '*.so.*'`
+    # All libs except GUI-only are installed now, so fixup them.
+    for libname in `find "$out/lib/" -name '*.so.*'` `find "$bin/lib/" -name '*.so.*'`
     do
       # I'm lazy to differentiate needed libs per-library, as the closure is the same.
       # Unfortunately --shrink-rpath would strip too much.
-      patchelf --set-rpath "$out/lib:$allLibPath" "$libname"
+      patchelf --set-rpath "$out/lib:$libPath" "$libname"
 
       libname_short=`echo -n "$libname" | sed 's/so\..*/so/'`
 
@@ -82,55 +94,23 @@ installPhase() {
       fi
     done
 
-    #patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.*
-    #patchelf --set-rpath $out/lib:$glPath $out/lib/libvdpau_nvidia.so.*.*
-    #patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.*
-    #patchelf --set-rpath $openclPath $out/lib/libnvidia-opencl.so.*.*
-
-    if test -z "$libsOnly"; then
-        # Install headers and /share files etc.
-        mkdir -p $out/include/nvidia
-        cp -p *.h $out/include/nvidia
-
-        mkdir -p $out/share/man/man1
-        cp -p *.1.gz $out/share/man/man1
-        rm $out/share/man/man1/nvidia-xconfig.1.gz
-
-        mkdir -p $out/share/applications
-        cp -p *.desktop $out/share/applications
-
-        mkdir -p $out/share/pixmaps
-        cp -p nvidia-settings.png $out/share/pixmaps
-
-        # Patch the `nvidia-settings.desktop' file.
-        substituteInPlace $out/share/applications/nvidia-settings.desktop \
-            --replace '__UTILS_PATH__' $out/bin \
-            --replace '__PIXMAP_PATH__' $out/share/pixmaps
-
+    if [ -n "$bin" ]; then
+        # Install /share files.
+        mkdir -p $bin/share/man/man1
+        cp -p *.1.gz $bin/share/man/man1
+        rm -f $bin/share/man/man1/{nvidia-xconfig,nvidia-settings,nvidia-persistenced}.1.gz
 
         # Install the programs.
-        mkdir -p $out/bin
-
-        for i in nvidia-settings nvidia-smi; do
-            cp $i $out/bin/$i
-            patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-                --set-rpath $out/lib:$programPath:$glPath $out/bin/$i
+        for i in nvidia-cuda-mps-control nvidia-cuda-mps-server nvidia-smi nvidia-debugdump; do
+            if [ -e "$i" ]; then
+                install -Dm755 $i $bin/bin/$i
+                patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+                    --set-rpath $out/lib:$libPath $bin/bin/$i
+            fi
         done
-
-        patchelf --set-rpath $glPath:$gtkPath $out/lib/libnvidia-gtk2.so.*.*
-
-        # Test a bit.
-        $out/bin/nvidia-settings --version
-    else
-        rm $out/lib/libnvidia-gtk2.*
+        # FIXME: needs PATH and other fixes
+        # install -Dm755 nvidia-bug-report.sh $bin/bin/nvidia-bug-report.sh
     fi
-
-    # For simplicity and dependency reduction, don't support the gtk3 interface.
-    rm $out/lib/libnvidia-gtk3.*
-
-    # Move VDPAU libraries to their place
-    mkdir "$out"/lib/vdpau
-    mv "$out"/lib/libvdpau* "$out"/lib/vdpau
 }