From 6bf27c2caeb621472151c63fc33c4951ce0188d1 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Tue, 11 Oct 2016 13:50:52 -0300
Subject: vulkan-loader: allow validation layers to be enabled

The loader now uses XDK_DATA_DIRS to find drivers and layers.
---
 pkgs/os-specific/linux/amdgpu-pro/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'pkgs/os-specific/linux/amdgpu-pro')

diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix
index 17a06664041..856989381ef 100644
--- a/pkgs/os-specific/linux/amdgpu-pro/default.nix
+++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix
@@ -92,12 +92,13 @@ in stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out
     cp -r usr/bin $out/bin
+    cp -r usr/share $out/share
     cp -r etc $out/etc
+    mv $out/etc/vulkan $out/share
     cp -r usr/include $out/include
     cp -r usr/lib/${libArch} $out/lib
     mv $out/lib/amdgpu-pro/* $out/lib/
     rmdir $out/lib/amdgpu-pro
-    cp -r usr/share $out/share
   '' + optionalString (!libsOnly) ''
     if [ -d $out/lib/xorg ]; then
       rm $out/lib/xorg
@@ -133,7 +134,7 @@ in stdenv.mkDerivation rec {
         perl -pi -e 's:${libReplaceDir}:${libCompatDir}:g' "$out/lib/$lib"
       fi
     done
-    substituteInPlace "$out/etc/vulkan/icd.d/amd_icd${bitness}.json" --replace "/usr/lib/${libArch}" "$out/lib"
+    substituteInPlace "$out/share/vulkan/icd.d/amd_icd${bitness}.json" --replace "/usr/lib/${libArch}" "$out/lib"
   '';
 
   buildInputs = [
-- 
cgit 1.4.1