From 8fb7c7fdfa232ce7aa6a4c2118806622c197d683 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Tue, 16 Feb 2021 20:01:57 +0000 Subject: busybox: fix patchShebangs & build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Our patchShebangs expect coreutils stat instead of busybox stat. This broke patching the dispatch script. By enabling strict dependencies and using explicit --host parameter we not only avoid cross-compiling breackages but also work around this problem. Signed-off-by: Jörg Thalheim --- pkgs/os-specific/linux/busybox/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index a4a7adeb8b7..6c034e1c2af 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -118,9 +118,11 @@ stdenv.mkDerivation rec { logger() { '$out'/bin/logger "$@"; }\ ' ${debianDispatcherScript} > ${outDispatchPath} chmod 555 ${outDispatchPath} - PATH=$out/bin patchShebangs ${outDispatchPath} + HOST_PATH=$out/bin patchShebangs --host ${outDispatchPath} ''; + strictDeps = true; + depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = lib.optionals (enableStatic && !useMusl && stdenv.cc.libc ? static) [ stdenv.cc.libc stdenv.cc.libc.static ]; -- cgit 1.4.1