From 96054245b54da2e94efeb5e36f9e71066c5d14d3 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 8 Jul 2021 14:13:30 +0200 Subject: [PATCH] foot: fix cross compilation * needs PKG_CONFIG_FOR_BUILD * in the non-native case we need wayland-scanner (build) and wayland-protocols (host) separately * ar needs targetPrefix as well --- .../applications/terminal-emulators/foot/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index 4f8d6832eddd..46d3c6c97c70 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -15,6 +15,7 @@ , scdoc , tllist , wayland-protocols +, wayland-scanner , pkg-config , utf8proc , allowPgo ? true @@ -77,7 +78,7 @@ let }."${compilerName}"; # ar with lto support - ar = { + ar = stdenv.cc.bintools.targetPrefix + { "clang" = "llvm-ar"; "gcc" = "gcc-ar"; "unknown" = "ar"; @@ -97,19 +98,24 @@ stdenv.mkDerivation rec { sha256 = "0yrz7n0wls8g8w7ja934icwxmng3sxh70x87qmzc9c9cb1wyd989"; }; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ + wayland-scanner meson ninja ncurses scdoc - tllist - wayland-protocols pkg-config ] ++ lib.optionals (compilerName == "clang") [ stdenv.cc.cc.libllvm.out ]; buildInputs = [ + tllist + wayland-protocols fontconfig freetype pixman