Commit 05f18e12 authored by Alyssa Ross's avatar Alyssa Ross Committed by Florian Klink
Browse files

vulkan-tools: depend on wayland-scanner 

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
parent 2e7aab88

pkgs/tools/graphics/vulkan-tools/default.nix

+3 −2
Original line number Diff line number Diff line
@@ -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"