diff options
| author | Vincent Haupert <mail@vincent-haupert.de> | 2022-12-02 09:54:39 +0100 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-12-08 14:16:18 +0000 |
| commit | e2507eb28743f2b5a79706266f85d4e0b99f80c4 (patch) | |
| tree | 63164d0b33bf6bd2cf46bea225175dd5cc2cbc1d | |
| parent | Merge pull request #205064 from NixOS/backport-204989-to-release-22.11 (diff) | |
| download | nixpkgs-origin/backport-204072-to-release-22.11.tar.gz | |
github-runner: make `ldd` and `ldconfig` paths absolute on Linuxorigin/backport-204072-to-release-22.11
(cherry picked from commit 97eaeee775071cb4c63b0134a346bf1c78ace871)
| -rw-r--r-- | pkgs/development/tools/continuous-integration/github-runner/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 84c9c9268496..9947f12e523e 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -7,6 +7,7 @@ , fetchFromGitHub , fetchurl , git +, glibc , icu , libkrb5 , lib @@ -259,7 +260,12 @@ stdenv.mkDerivation rec { substituteInPlace $out/lib/run.sh --replace '"$DIR"/bin' '"$DIR"/lib' substituteInPlace $out/lib/config.sh --replace './bin' $out'/lib' \ --replace 'source ./env.sh' $out/bin/env.sh - + '' + lib.optionalString stdenv.isLinux '' + # Make binary paths absolute + substituteInPlace $out/lib/config.sh \ + --replace 'ldd' '${glibc}/bin/ldd' \ + --replace '/sbin/ldconfig' '${glibc}/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' ' ' substituteInPlace $out/lib/run-helper.sh --replace '"$DIR"/bin/' '"$DIR"/' |