diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-12-07 14:04:47 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-12-07 14:04:47 +0100 |
| commit | ba08e4e99b00a6916c4360de7288a7bfcef85328 (patch) | |
| tree | 347c8b6ad50fcaafc08e50f1307a861378650440 /nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix | |
| parent | 190fd93d11701ad81af757be6260df9635bdb41a (diff) | |
| parent | 2c7f3c0fb7c08a0814627611d9d7d45ab6d75335 (diff) | |
| download | nixlib-ba08e4e99b00a6916c4360de7288a7bfcef85328.tar nixlib-ba08e4e99b00a6916c4360de7288a7bfcef85328.tar.gz nixlib-ba08e4e99b00a6916c4360de7288a7bfcef85328.tar.bz2 nixlib-ba08e4e99b00a6916c4360de7288a7bfcef85328.tar.lz nixlib-ba08e4e99b00a6916c4360de7288a7bfcef85328.tar.xz nixlib-ba08e4e99b00a6916c4360de7288a7bfcef85328.tar.zst nixlib-ba08e4e99b00a6916c4360de7288a7bfcef85328.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix b/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix index e148f51d8689..d590ac7d340c 100644 --- a/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, buildPackages , cmake , pkg-config , python3 @@ -72,12 +73,14 @@ stdenv.mkDerivation rec { dontPatchELF = true; + env.PKG_CONFIG_WAYLAND_SCANNER_WAYLAND_SCANNER="${buildPackages.wayland-scanner}/bin/wayland-scanner"; + cmakeFlags = [ # Don't build the mock ICD as it may get used instead of other drivers, if installed "-DBUILD_ICD=OFF" # vulkaninfo loads libvulkan using dlopen, so we have to add it manually to RPATH "-DCMAKE_INSTALL_RPATH=${libraryPath}" - "-DPKG_CONFIG_EXECUTABLE=${pkg-config}/bin/pkg-config" + "-DPKG_CONFIG_EXECUTABLE=${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config" "-DGLSLANG_INSTALL_DIR=${glslang}" # Hide dev warnings that are useless for packaging "-Wno-dev" |