From 756c839aa0cc4efcabc2862ebc5234f1c2c53f1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= Date: Fri, 9 Dec 2022 13:22:05 +0100 Subject: [PATCH] github-runner: fix path to `ldd` and `ldconfig` Use `glibc.bin` to run `ldd` and `ldconfig` --- .../tools/continuous-integration/github-runner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 9947f12e523e..8c129d5ff18a 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -263,8 +263,8 @@ stdenv.mkDerivation rec { '' + lib.optionalString stdenv.isLinux '' # Make binary paths absolute substituteInPlace $out/lib/config.sh \ - --replace 'ldd' '${glibc}/bin/ldd' \ - --replace '/sbin/ldconfig' '${glibc}/bin/ldconfig' + --replace 'ldd' '${glibc.bin}/bin/ldd' \ + --replace '/sbin/ldconfig' '${glibc.bin}/bin/ldconfig' '' + '' # Remove uneeded copy for run-helper template substituteInPlace $out/lib/run.sh --replace 'cp -f "$DIR"/run-helper.sh.template "$DIR"/run-helper.sh' ' '