From 5b2b4dc0fd0b81c0fc6996328643b176ae23e949 Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Thu, 2 May 2024 09:54:14 -0400 Subject: [PATCH] flake.nix: add exporting of AC_LOCAL which was not exported in deveenv.sh. Was causing another ac macro misbehavior since host ac was not considered by aclocal and autoreconf TODO: Might want to revert 6a1791112de451509d81e03bce5bdd6b1a49a79f if talos-2 board is able to build 3rdparty/sb-sign-tool Signed-off-by: Thierry Laurion --- flake.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flake.nix b/flake.nix index a53ef508..bd9a96f6 100644 --- a/flake.nix +++ b/flake.nix @@ -92,6 +92,7 @@ -e NIX_CFLAGS_COMPILE_FOR_TARGET \ -e NIX_LDFLAGS_FOR_TARGET \ -e PKG_CONFIG_PATH_FOR_TARGET \ + -e ACLOCAL_PATH \ ${self.devShell.${system}} >$out ''; packages.dockerImage = pkgs.dockerTools.buildLayeredImage { @@ -117,6 +118,7 @@ -e NIX_LDFLAGS_FOR_TARGET \ -e NIX_PKG_CONFIG_WRAPPER_TARGET \ -e PKG_CONFIG_PATH_FOR_TARGET \ + -e ACLOCAL_PATH \ ${self.devShell.${system}} >/devenv.sh printf '[safe]\n\tdirectory = *\n' >/.gitconfig