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

waffle: 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.

Also, add pkg-config to depsBuildBuild to fix cross.
parent 05f18e12

pkgs/development/libraries/waffle/default.nix

+5 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
, pkg-config

, python3

, x11Support ? true, libxcb, libX11

, waylandSupport ? true, wayland, wayland-protocols

, waylandSupport ? true, wayland, wayland-protocols, wayland-scanner

, useGbm ? true, mesa, udev

}:
@@ -43,6 +43,8 @@ stdenv.mkDerivation rec { 
    mesa

  ];



  depsBuildBuild = [ pkg-config ];



  dontUseCmakeConfigure = true;



  nativeBuildInputs = [
@@ -52,6 +54,8 @@ stdenv.mkDerivation rec { 
    ninja

    pkg-config

    python3

  ] ++ lib.optionals waylandSupport [

    wayland-scanner

  ];



  PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR= "${placeholder "out"}/share/bash-completion/completions";