From b7c4ff74079dc19cfd4c8209dde38f950de323d5 Mon Sep 17 00:00:00 2001
From: Matthew Stewart <m.scott.stewart@gmail.com>
Date: Mon, 2 Apr 2018 00:33:52 -0400
Subject: vulkan-loader: Fix validation layers.

When vulkan tries to load validation layers, it looks for JSON files in
several directories, one of which is:

<vulkan-loader>/etc/vulkan/explicit_layer.d

It does *not* look in:

<vulkan-loader>/share/vulkan/explicit_layer.d

Yet that is where the install phase of the vulkan-loader default.nix
places the files.  Thus, I modified the install phase to place them in
the etc location instead.
---
 pkgs/development/libraries/vulkan-loader/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix
index b9b18dc79103..0d3bfd4379fe 100644
--- a/pkgs/development/libraries/vulkan-loader/default.nix
+++ b/pkgs/development/libraries/vulkan-loader/default.nix
@@ -47,10 +47,11 @@ stdenv.mkDerivation rec {
     mkdir -p $out/lib $out/bin
     cp -d loader/libvulkan.so* $out/lib
     cp demos/vulkaninfo $out/bin
-    mkdir -p $out/lib $out/share/vulkan/explicit_layer.d
+    mkdir -p $out/etc/vulkan/explicit_layer.d
+    ln -s $out/etc $out/share
     cp -L layers/*.so $out/lib/
-    cp -L layers/*.json $out/share/vulkan/explicit_layer.d/
-    sed -i "s:\\./lib:$out/lib/lib:g" "$out/share/vulkan/"*/*.json
+    cp -L layers/*.json $out/etc/vulkan/explicit_layer.d/
+    sed -i "s:\\./lib:$out/lib/lib:g" "$out/etc/vulkan/"*/*.json
     mkdir -p $dev/include
     cp -rv ../include $dev/
     mkdir -p $demos/share/vulkan-demos
-- 
cgit 1.4.1