lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions

heptapod-runner: make sure our wrapped Mercurial is on the PATH

Browse source
This commit is contained in:
Luke Granger-Brown 2020-05-09 13:22:49 +01:00
parent e613112eda
commit ed8c77a9c6
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
nix/pkgs/heptapod-runner.nix
View file

@ -6,16 +6,20 @@ let
rev = "b4fda456f403"; rev = "b4fda456f403";
sha256 = "1ybkd2jnq2dvkj157w2nlf9rmrgbd8kas43kimi9aarajgi9sri1"; sha256 = "1ybkd2jnq2dvkj157w2nlf9rmrgbd8kas43kimi9aarajgi9sri1";
}; };
wrappedMercurial = pkgs.symlinkJoin {
name = pkgs.mercurial.name;
paths = [ pkgs.mercurial ];
postBuild = ''
mkdir -p "$out/etc/mercurial"
cp "${newSrc}/dockerfiles/build/runner.hgrc" "$out/etc/mercurial/hgrc"
'';
};
in in
pkgs.gitlab-runner.overrideAttrs (oldAttrs: rec { pkgs.gitlab-runner.overrideAttrs (oldAttrs: rec {
inherit version; inherit version;
buildInputs = [ buildInputs = oldAttrs.buildInputs ++ [ wrappedMercurial pkgs.makeWrapper ];
(pkgs.mercurial.overrideAttrs (hgOldAttrs: rec {
postInstall = ''
mkdir -p "$out/etc/mercurial"
cp "${newSrc}/dockerfiles/build/runner.hgrc" "$out/etc/mercurial/hgrc"
'';
}))
];
src = newSrc; src = newSrc;
postInstall = ''
wrapProgram $bin/bin/gitlab-runner --prefix PATH : ${wrappedMercurial}
'';
}) })