cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #204072 from veehaitch/gh-runner-config

Browse source
This commit is contained in:
Sandro 2022-12-08 15:09:08 +01:00 committed by GitHub
commit 51da413217
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/tools/continuous-integration/github-runner/default.nix
View file

@ -7,6 +7,7 @@
, fetchFromGitHub , fetchFromGitHub
, fetchurl , fetchurl
, git , git
, glibc
, icu , icu
, libkrb5 , libkrb5
, lib , lib
@ -259,7 +260,12 @@ stdenv.mkDerivation rec {
substituteInPlace $out/lib/run.sh --replace '"$DIR"/bin' '"$DIR"/lib' substituteInPlace $out/lib/run.sh --replace '"$DIR"/bin' '"$DIR"/lib'
substituteInPlace $out/lib/config.sh --replace './bin' $out'/lib' \ substituteInPlace $out/lib/config.sh --replace './bin' $out'/lib' \
--replace 'source ./env.sh' $out/bin/env.sh --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 # 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.sh --replace 'cp -f "$DIR"/run-helper.sh.template "$DIR"/run-helper.sh' ' '
substituteInPlace $out/lib/run-helper.sh --replace '"$DIR"/bin/' '"$DIR"/' substituteInPlace $out/lib/run-helper.sh --replace '"$DIR"/bin/' '"$DIR"/'