diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2017-05-01 07:34:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-01 07:34:46 +0200 |
| commit | d997f80a5ff566204709927a52b489948e75e4ff (patch) | |
| tree | bf95119314f0ffcf3e4f092dc59ea6da2c6e6494 /pkgs/development/libraries/vulkan-loader | |
| parent | 9c8bda7f22f8b93e0264840bf4593e729f6e3698 (diff) | |
| parent | df94900353d6a9d6c1b2822389a2775e6c99430d (diff) | |
| download | nixpkgs-d997f80a5ff566204709927a52b489948e75e4ff.tar nixpkgs-d997f80a5ff566204709927a52b489948e75e4ff.tar.gz nixpkgs-d997f80a5ff566204709927a52b489948e75e4ff.tar.bz2 nixpkgs-d997f80a5ff566204709927a52b489948e75e4ff.tar.lz nixpkgs-d997f80a5ff566204709927a52b489948e75e4ff.tar.xz nixpkgs-d997f80a5ff566204709927a52b489948e75e4ff.tar.zst nixpkgs-d997f80a5ff566204709927a52b489948e75e4ff.zip | |
Merge pull request #24381 from ljli/vulkan-loader-demos
vulkan-loader: demos: fix cube/cubepp
Diffstat (limited to 'pkgs/development/libraries/vulkan-loader')
| -rw-r--r-- | pkgs/development/libraries/vulkan-loader/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 4432c22bcd8..f62279786c6 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, fetchFromGitHub, cmake, pkgconfig, git, python3, python3Packages, glslang, spirv-tools, x11, libxcb, libXrandr, - libXext, wayland, mesa_noglu }: + libXext, wayland, mesa_noglu, makeWrapper }: let version = "1.0.42.2"; @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { name = "vulkan-loader-${version}"; inherit version src; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ cmake pkgconfig git python3 python3Packages.lxml glslang spirv-tools x11 libxcb libXrandr libXext wayland ]; @@ -50,7 +51,10 @@ stdenv.mkDerivation rec { mkdir -p $demos/bin cp demos/*.spv demos/*.ppm $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; { description = "LunarG Vulkan loader"; |