From 03d7cf65a43488d1a9d5055bac6634242c7dae85 Mon Sep 17 00:00:00 2001 From: Colin Date: Wed, 22 Feb 2023 06:03:14 +0000 Subject: [PATCH] cross compilation: remove emulation from ncftp --- hosts/common/cross.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hosts/common/cross.nix b/hosts/common/cross.nix index c8e2900a..d4d14460 100644 --- a/hosts/common/cross.nix +++ b/hosts/common/cross.nix @@ -728,10 +728,11 @@ in # nativeBuildInputs = orig.nativeBuildInputs ++ [ next.libkate next.cairo next.pango ]; # }); - ncftp = prev.ncftp.override { - # fixes: "ar: No such file or directory" - inherit (emulated) stdenv; - }; + ncftp = prev.ncftp.overrideAttrs (upstream: { + # fixes: "ar: command not found" + # `ar` is provided by bintools + nativeBuildInputs = upstream.nativeBuildInputs or [] ++ [ next.bintools ]; + }); networkmanager-fortisslvpn = prev.networkmanager-fortisslvpn.overrideAttrs (orig: { # fixes "gdbus-codegen: command not found" nativeBuildInputs = orig.nativeBuildInputs ++ [ next.glib ];