diff options
Diffstat (limited to 'pkgs/os-specific/linux/nvidia-x11/builder.sh')
| -rwxr-xr-x | pkgs/os-specific/linux/nvidia-x11/builder.sh | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 09c104f09e73..c1f165c45dd5 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -19,7 +19,7 @@ buildPhase() { sysSrc=$(echo $kernel/lib/modules/$kernelVersion/source) sysOut=$(echo $kernel/lib/modules/$kernelVersion/build) unset src # used by the nv makefile - make SYSSRC=$sysSrc SYSOUT=$sysOut module "-j${NIX_BUILD_CORES}" "-l${NIX_BUILD_CORES}" + make SYSSRC=$sysSrc SYSOUT=$sysOut module cd .. fi @@ -34,14 +34,6 @@ installPhase() { cp -prd *.so.* tls "$out/lib/" rm "$out"/lib/lib{glx,nvidia-wfb}.so.* # handled separately - # According to nvidia, we're supposed to use GLVND. - # But so far I've failed to make any applications run using that stack. - # - # If you want to try it, swap the two lines below. - - #rm "$out"/lib/libGL.so.${versionNumber} # Non-GLVND - rm $out/lib/libGL.so.1.* # GLVND - if test -z "$libsOnly"; then # Install the X drivers. mkdir -p $out/lib/xorg/modules @@ -69,7 +61,7 @@ installPhase() { libname_short=`echo -n "$libname" | sed 's/so\..*/so/'` # nvidia's EGL stack seems to expect libGLESv2.so.2 to be available - if [ $(basename "$libname_short") == "libGLESv2.so" -a "$libname" != "$libname_short.2" ]; then + if [ $(basename "$libname_short") == "libGLESv2.so" ]; then ln -srnf "$libname" "$libname_short.2" fi @@ -127,6 +119,9 @@ installPhase() { # For simplicity and dependency reduction, don't support the gtk3 interface. rm $out/lib/libnvidia-gtk3.* + # We distribute these separately in `libvdpau` + rm "$out"/lib/libvdpau{.*,_trace.*} + # Move VDPAU libraries to their place mkdir "$out"/lib/vdpau mv "$out"/lib/libvdpau* "$out"/lib/vdpau |