diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index b507ed416c12..2f43f76584a9 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -17,6 +17,7 @@ , vulkan-volk , wayland , wayland-protocols +, wayland-scanner , moltenvk , AppKit , Cocoa @@ -53,6 +54,7 @@ stdenv.mkDerivation rec { libXrandr wayland wayland-protocols + wayland-scanner ] ++ lib.optionals stdenv.isDarwin [ moltenvk moltenvk.dev @@ -64,14 +66,13 @@ stdenv.mkDerivation rec { dontPatchELF = true; - env.PKG_CONFIG_WAYLAND_SCANNER_WAYLAND_SCANNER="${buildPackages.wayland-scanner}/bin/wayland-scanner"; + env.PKG_CONFIG_WAYLAND_SCANNER_WAYLAND_SCANNER = "${lib.getBin 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=${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config" "-DGLSLANG_INSTALL_DIR=${glslang}" # Hide dev warnings that are useless for packaging "-Wno-dev"