From 120269fe5c10e95d590cf97d62561228f049f0dd Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Mon, 31 Oct 2022 19:08:02 -0400 Subject: [PATCH] pkgsStatic.tup: fix build Patch build system to use prefixed versions of "gcc", "ar" and "pkg-config". --- .../development/tools/build-managers/tup/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/tup/default.nix b/pkgs/development/tools/build-managers/tup/default.nix index 0763f2e9359c..3d0b68b12d84 100644 --- a/pkgs/development/tools/build-managers/tup/default.nix +++ b/pkgs/development/tools/build-managers/tup/default.nix @@ -21,7 +21,17 @@ in stdenv.mkDerivation rec { configurePhase = '' substituteInPlace src/tup/link.sh --replace '`git describe' '`echo ${version}' - substituteInPlace Tuprules.tup --replace 'pcre-config' 'pkg-config libpcre' + + for f in Tupfile Tuprules.tup src/tup/server/Tupfile build.sh; do + substituteInPlace "$f" \ + --replace "pkg-config" "${stdenv.cc.targetPrefix}pkg-config" \ + --replace "pcre-config" "${stdenv.cc.targetPrefix}pkg-config libpcre" + done + + cat << EOF > tup.config + CONFIG_CC=${stdenv.cc.targetPrefix}cc + CONFIG_AR=${stdenv.cc.targetPrefix}ar + EOF ''; # Regular tup builds require fusermount to have suid, which nix cannot