Merge pull request #205294 from jfroche/fix/github-action-runner-glibc

github-runner: fix path to `ldd` and `ldconfig`
This commit is contained in:
maxine 2022-12-11 01:24:47 +01:00 committed by GitHub
commit 7bbdd67dee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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' ' '