From 6d70a4116d918646c579ae7d2d4613b613f4c868 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 22 Apr 2023 11:11:20 +0000 Subject: [PATCH] havoc: fix cross Uses literal "pkg-config" rather than $PKG_CONFIG, but that's fine, because the only thing it uses for is wayland-protocols, which is architecture-independent, so we just move it into nativeBuildInputs and get pkg-config from pkgsBuildBuild. --- .../applications/terminal-emulators/havoc/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/terminal-emulators/havoc/default.nix b/pkgs/applications/terminal-emulators/havoc/default.nix index 80ede664b5b1..ca2f7b07a17f 100644 --- a/pkgs/applications/terminal-emulators/havoc/default.nix +++ b/pkgs/applications/terminal-emulators/havoc/default.nix @@ -3,8 +3,9 @@ , fetchFromGitHub , libxkbcommon , pkg-config -, wayland , wayland-protocols +, wayland-scanner +, wayland }: stdenv.mkDerivation rec { @@ -18,14 +19,18 @@ stdenv.mkDerivation rec { hash = "sha256-jvGm2gFdMS61otETF7gOEpYn6IuLfqI95IpEVfIv+C4="; }; - nativeBuildInputs = [ + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ + wayland-protocols + wayland-scanner + ]; + buildInputs = [ libxkbcommon wayland - wayland-protocols ]; dontConfigure = true;