public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #24381 from ljli/vulkan-loader-demos

Browse Source 
vulkan-loader: demos: fix cube/cubepp
This commit is contained in:
Michael Raskin 2017-05-01 07:34:46 +02:00 committed by GitHub
commit d997f80a5f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/vulkan-loader/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchgit, fetchFromGitHub, cmake, pkgconfig, git, python3, { stdenv, fetchgit, fetchFromGitHub, cmake, pkgconfig, git, python3,
python3Packages, glslang, spirv-tools, x11, libxcb, libXrandr, python3Packages, glslang, spirv-tools, x11, libxcb, libXrandr,
libXext, wayland, mesa_noglu }: libXext, wayland, mesa_noglu, makeWrapper }:
let let
version = "1.0.42.2"; version = "1.0.42.2";
@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
name = "vulkan-loader-${version}"; name = "vulkan-loader-${version}";
inherit version src; inherit version src;
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ cmake pkgconfig git python3 python3Packages.lxml buildInputs = [ cmake pkgconfig git python3 python3Packages.lxml
glslang spirv-tools x11 libxcb libXrandr libXext wayland glslang spirv-tools x11 libxcb libXrandr libXext wayland
]; ];
@ -50,6 +51,9 @@ stdenv.mkDerivation rec {
mkdir -p $demos/bin mkdir -p $demos/bin
cp demos/*.spv demos/*.ppm $demos/bin cp demos/*.spv demos/*.ppm $demos/bin
find demos -type f -executable -not -name vulkaninfo -exec cp {} $demos/bin \; find demos -type f -executable -not -name vulkaninfo -exec cp {} $demos/bin \;
for p in cube cubepp; do
wrapProgram $demos/bin/$p --run "cd $demos/bin"
done
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {