From 8fe96a1926e4eb96b69fe99f187b378d7cac461e Mon Sep 17 00:00:00 2001 From: David McFarland Date: Sun, 25 Sep 2016 17:33:09 -0300 Subject: [PATCH] vulkan-loader: package headers, layers and demos --- .../libraries/vulkan-loader/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 8b986798517d..334489cb22db 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -36,6 +36,8 @@ stdenv.mkDerivation rec { "-DBUILD_WSI_WAYLAND_SUPPORT=ON" # XLIB/XCB supported by default ]; + outputs = [ "out" "dev" "demos" ]; + preConfigure = '' checkRev() { [ "$2" = $(cat "$1_revision") ] || (echo "ERROR: dependency $1 is revision $2 but should be revision" $(cat "$1_revision") && exit 1) @@ -46,11 +48,18 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/lib - mkdir -p $out/bin - cp loader/libvulkan.so* $out/lib + mkdir -p $out/lib $out/bin + cp -d loader/libvulkan.so* $out/lib cp demos/vulkaninfo $out/bin - ''; + mkdir -p $out/lib $out/etc/explicit_layer.d + cp -d layers/*.so $out/lib/ + cp -d layers/*.json $out/etc/explicit_layer.d/ + sed -i "s:\\./lib:$out/lib/lib:g" "$out/etc/"**/*.json + mkdir -p $dev/include + cp -rv ../include $dev/ + mkdir -p $demos/bin + cp demos/smoketest demos/tri demos/cube demos/*.spv demos/*.ppm $demos/bin + ''; meta = with stdenv.lib; { description = "LunarG Vulkan loader";