diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2018-06-24 05:42:42 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-24 05:42:42 +0000 |
| commit | f8b0f68fd5256d1e1c9ee77f1d12fbfed7b3572f (patch) | |
| tree | dab9d63dfaf953baa5604d34c35510436af11dd6 /pkgs | |
| parent | 00a4323e62566af039c016cadbaec02b16121ba9 (diff) | |
| parent | b7c4ff74079dc19cfd4c8209dde38f950de323d5 (diff) | |
| download | nixlib-f8b0f68fd5256d1e1c9ee77f1d12fbfed7b3572f.tar nixlib-f8b0f68fd5256d1e1c9ee77f1d12fbfed7b3572f.tar.gz nixlib-f8b0f68fd5256d1e1c9ee77f1d12fbfed7b3572f.tar.bz2 nixlib-f8b0f68fd5256d1e1c9ee77f1d12fbfed7b3572f.tar.lz nixlib-f8b0f68fd5256d1e1c9ee77f1d12fbfed7b3572f.tar.xz nixlib-f8b0f68fd5256d1e1c9ee77f1d12fbfed7b3572f.tar.zst nixlib-f8b0f68fd5256d1e1c9ee77f1d12fbfed7b3572f.zip | |
Merge pull request #38316 from Rotaerk/vulkan-etc
Fix where Vulkan validation layer JSON files are placed by the nixpkgs install phase
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/vulkan-loader/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
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 |