www

commit 5ba3174763e690347488643bb8f939088998a11e
parent 04a6b0833fbb46a0f7e83ab477599c5f3eb60564
Author: Joe Hermaszewski <git@monoid.al>
Date:   Mon, 22 Apr 2019 21:57:23 +0800

Add Vulkan validation layers to Nvidia wrapper

Diffstat:
M
default.nix
 | 
10
++++++++--

1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/default.nix b/default.nix
@@ -59,9 +59,15 @@ rec {
      };
     } ''
       mkdir -p $out/bin
-      cat > $out/bin/nix${api}Nvidia << FOO
+      cat > $out/bin/nix${api}Nvidia << 'FOO'
       #!/usr/bin/env sh
-      export LD_LIBRARY_PATH=${libglvnd}/lib:${nvidiaLibsOnly}/lib:\$LD_LIBRARY_PATH
+      ${lib.optionalString (api == "Vulkan") ''export VK_LAYER_PATH=${nixpkgs.vulkan-validation-layers}/share/vulkan/explicit_layer.d''}
+
+      export LD_LIBRARY_PATH=${lib.makeLibraryPath ([
+        libglvnd
+        nvidiaLibsOnly
+      ] ++ lib.optional (api == "Vulkan") nixpkgs.vulkan-validation-layers)
+      }''${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
       "\$@"
       FOO