From d474d6efe28a0805f9b63a5deeb1f5177f13207c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 11 Feb 2023 11:23:50 +0000 Subject: [PATCH] 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. --- pkgs/development/libraries/waffle/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/waffle/default.nix b/pkgs/development/libraries/waffle/default.nix index 361c1e17336a..9dccdb9dded3 100644 --- a/pkgs/development/libraries/waffle/default.nix +++ b/pkgs/development/libraries/waffle/default.nix @@ -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";