heptapod-runner: make sure our wrapped Mercurial is on the PATH
This commit is contained in:
parent
e613112eda
commit
ed8c77a9c6
1 changed files with 12 additions and 8 deletions
|
@ -6,16 +6,20 @@ let
|
||||||
rev = "b4fda456f403";
|
rev = "b4fda456f403";
|
||||||
sha256 = "1ybkd2jnq2dvkj157w2nlf9rmrgbd8kas43kimi9aarajgi9sri1";
|
sha256 = "1ybkd2jnq2dvkj157w2nlf9rmrgbd8kas43kimi9aarajgi9sri1";
|
||||||
};
|
};
|
||||||
in
|
wrappedMercurial = pkgs.symlinkJoin {
|
||||||
pkgs.gitlab-runner.overrideAttrs (oldAttrs: rec {
|
name = pkgs.mercurial.name;
|
||||||
inherit version;
|
paths = [ pkgs.mercurial ];
|
||||||
buildInputs = [
|
postBuild = ''
|
||||||
(pkgs.mercurial.overrideAttrs (hgOldAttrs: rec {
|
|
||||||
postInstall = ''
|
|
||||||
mkdir -p "$out/etc/mercurial"
|
mkdir -p "$out/etc/mercurial"
|
||||||
cp "${newSrc}/dockerfiles/build/runner.hgrc" "$out/etc/mercurial/hgrc"
|
cp "${newSrc}/dockerfiles/build/runner.hgrc" "$out/etc/mercurial/hgrc"
|
||||||
'';
|
'';
|
||||||
}))
|
};
|
||||||
];
|
in
|
||||||
|
pkgs.gitlab-runner.overrideAttrs (oldAttrs: rec {
|
||||||
|
inherit version;
|
||||||
|
buildInputs = oldAttrs.buildInputs ++ [ wrappedMercurial pkgs.makeWrapper ];
|
||||||
src = newSrc;
|
src = newSrc;
|
||||||
|
postInstall = ''
|
||||||
|
wrapProgram $bin/bin/gitlab-runner --prefix PATH : ${wrappedMercurial}
|
||||||
|
'';
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in a new issue