dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

waffle: depend on wayland-scanner

Browse Source 
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.
This commit is contained in:
Alyssa Ross 2023-02-11 11:23:50 +00:00 committed by Florian Klink
parent 05f18e1209
commit d474d6efe2
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/waffle/default.nix
View File

@ -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";