Merge pull request #271872 from uninsane/pr-cross-vulkan-tools

vulkan-tools: support cross compilation

authored by Pierre Bourdon and committed by GitHub de502c4d 411d94a1

+4 -1
+4 -1
pkgs/tools/graphics/vulkan-tools/default.nix
··· 1 { lib 2 , stdenv 3 , fetchFromGitHub 4 , cmake 5 , pkg-config 6 , python3 ··· 72 73 dontPatchELF = true; 74 75 cmakeFlags = [ 76 # Don't build the mock ICD as it may get used instead of other drivers, if installed 77 "-DBUILD_ICD=OFF" 78 # vulkaninfo loads libvulkan using dlopen, so we have to add it manually to RPATH 79 "-DCMAKE_INSTALL_RPATH=${libraryPath}" 80 - "-DPKG_CONFIG_EXECUTABLE=${pkg-config}/bin/pkg-config" 81 "-DGLSLANG_INSTALL_DIR=${glslang}" 82 # Hide dev warnings that are useless for packaging 83 "-Wno-dev"
··· 1 { lib 2 , stdenv 3 , fetchFromGitHub 4 + , buildPackages 5 , cmake 6 , pkg-config 7 , python3 ··· 73 74 dontPatchELF = true; 75 76 + env.PKG_CONFIG_WAYLAND_SCANNER_WAYLAND_SCANNER="${buildPackages.wayland-scanner}/bin/wayland-scanner"; 77 + 78 cmakeFlags = [ 79 # Don't build the mock ICD as it may get used instead of other drivers, if installed 80 "-DBUILD_ICD=OFF" 81 # vulkaninfo loads libvulkan using dlopen, so we have to add it manually to RPATH 82 "-DCMAKE_INSTALL_RPATH=${libraryPath}" 83 + "-DPKG_CONFIG_EXECUTABLE=${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config" 84 "-DGLSLANG_INSTALL_DIR=${glslang}" 85 # Hide dev warnings that are useless for packaging 86 "-Wno-dev"