From 09cb41b7ac6ff436fc7554cfc59745276c4515ed Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Mon, 3 Aug 2020 20:20:30 -0400 Subject: fix(3p/nix): Properly configure SANDBOX_SHELL point the SANDBOX_SHELL macro at the actual path to busybox on the build machine, or allow it to be configured at build-time with a cmake option. Change-Id: I044a1315ba9baa3bc9ceddf29f36d14f9f9ccd96 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1632 Tested-by: BuildkiteCI Reviewed-by: tazjin --- third_party/nix/config.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'third_party/nix/config.h.in') diff --git a/third_party/nix/config.h.in b/third_party/nix/config.h.in index 39a094395437..986969705b82 100644 --- a/third_party/nix/config.h.in +++ b/third_party/nix/config.h.in @@ -23,7 +23,7 @@ #define NIX_LIBEXEC_DIR "@CMAKE_INSTALL_FULL_LIBEXECDIR@" #define NIX_BIN_DIR "@CMAKE_INSTALL_FULL_BINDIR@" #define NIX_MAN_DIR "@CMAKE_INSTALL_FULL_MANDIR@" -#define SANDBOX_SHELL "/nix/store/zq8biwi5mj2lrn68kx0lk0fkpbqypyxd-busybox-1.31.1-x86_64-unknown-linux-musl/bin/busybox" +#define SANDBOX_SHELL "@SANDBOX_SHELL@" // Defines used only in tests (e.g. to access data) #define NIX_SRC_DIR "@CMAKE_SOURCE_DIR@" -- cgit 1.4.1