www

commit 410cd5b482c3b316eb51856b8e06f702e54401c3
parent 5f330c2185dc7816fed431d29c4249ab090deb00
Author: Guillaume Bouchard <guillaum.bouchard@gmail.com>
Date:   Wed, 10 Jun 2020 17:23:31 +0200

Do not build nvidia linux module for nixGLNvidia

Partial fix for #55.

This commit does not build the nvidia kernel module for `nixGLNvidia`
using `libsOnly = true`.

This cannot be applied to `nixGLNvidiaBumblebee` which needs some stuffs
in `nvidia_x11.bin` which only appears if it is built with `libsOnly =
false`.

Diffstat:
M
nixGL.nix
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/nixGL.nix b/nixGL.nix
@@ -110,12 +110,12 @@ in
       #!/usr/bin/env sh
       ${lib.optionalString (api == "Vulkan") ''export VK_LAYER_PATH=${vulkan-validation-layers}/share/vulkan/explicit_layer.d''}
 
-        ${lib.optionalString (api == "Vulkan") ''export VK_ICD_FILENAMES=${nvidia}/share/vulkan/icd.d/nvidia.json${lib.optionalString enable32bits ":${nvidia.lib32}/share/vulkan/icd.d/nvidia.json"}:$VK_ICD_FILENAMES''}
+        ${lib.optionalString (api == "Vulkan") ''export VK_ICD_FILENAMES=${nvidiaLibsOnly}/share/vulkan/icd.d/nvidia.json${lib.optionalString enable32bits ":${nvidiaLibsOnly.lib32}/share/vulkan/icd.d/nvidia.json"}:$VK_ICD_FILENAMES''}
         export LD_LIBRARY_PATH=${lib.makeLibraryPath ([
           libglvnd
           nvidiaLibsOnly
         ] ++ lib.optional (api == "Vulkan") vulkan-validation-layers
-        ++ lib.optionals enable32bits [nvidia.lib32 pkgsi686Linux.libglvnd])
+        ++ lib.optionals enable32bits [nvidiaLibsOnly.lib32 pkgsi686Linux.libglvnd])
       }:''${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
         "$@"
       '';