nvidia-drivers: add support for 364

triton · Mar 21, 2016 · acc4ffa · acc4ffa
1 parent f79c971
commit acc4ffa
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/pkgs/all-pkgs/nvidia-drivers/builder-generic.sh b/pkgs/all-pkgs/nvidia-drivers/builder-generic.sh
@@ -228,13 +228,20 @@ installPhase() {
     install -D -m 644 -v 'kernel/nvidia.ko' \
       "${out}/lib/modules/${kernelVersion}/misc/nvidia.ko"
 
-    # NVIDIA modesetting kernel module
-    if [ ${versionMajor} -ge 358 ] ; then
-      nuke-refs 'kernel/nvidia-modeset.ko'
-      install -D -m 644 -v 'kernel/nvidia-modeset.ko' \
-        "${out}/lib/modules/${kernelVersion}/misc/nvidia-modeset.ko"
+    # NVIDIA direct rendering manager kernel modesetting (DRM KMS) kernel module
+    if [ ${versionMajor} -ge 364 ] ; then
+      nuke-refs 'kernel/nvidia-drm.ko'
+      install -D -m 644 -v 'kernel/nvidia-drm.ko' \
+        "${out}/lib/modules/${kernelVersion}/misc/nvidia-drm.ko"
     fi
 
+  # NVIDIA modesetting kernel module
+  if [ ${versionMajor} -ge 358 ] ; then
+    nuke-refs 'kernel/nvidia-modeset.ko'
+    install -D -m 644 -v 'kernel/nvidia-modeset.ko' \
+      "${out}/lib/modules/${kernelVersion}/misc/nvidia-modeset.ko"
+  fi
+
     # NVIDIA cuda unified virtual memory kernel module
     if [ ${versionMajor} -ge 340 ] ; then
       # The uvm kernel module build directory changed in 355+
@@ -320,6 +327,7 @@ installPhase() {
     #  "${out}/lib/libGLX_indirect.so.0"
 
     ## Internal driver components
+    nvidia_lib_install 364 0 'libnvidia-egl-wayland'
     nvidia_lib_install 340 0 'libnvidia-eglcore'
     nvidia_lib_install 304 0 'libnvidia-glcore'
     nvidia_lib_install 340 0 'libnvidia-glsi'

diff --git a/pkgs/all-pkgs/nvidia-drivers/default.nix b/pkgs/all-pkgs/nvidia-drivers/default.nix
@@ -11,7 +11,7 @@
 , kernel ? null
 
 # Userspace dependencies
-, libglvnd
+, wayland
 , xorg
 , zlib
 
@@ -172,6 +172,7 @@ stdenv.mkDerivation {
   );
   allLibPath = makeLibraryPath ([
     stdenv.cc.cc
+    wayland
     xorg.libX11
     xorg.libXau
     xorg.libxcb
@@ -212,6 +213,7 @@ stdenv.mkDerivation {
   '';*/
 
   dontStrip = true;
+  fpic = false;
 
   passthru = {
     inherit