Skip to content

Commit

Permalink
fix: proviso
Browse files Browse the repository at this point in the history
  • Loading branch information
blaggacao committed Jun 16, 2023
1 parent 91061c6 commit 9339bb5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 2 additions & 1 deletion lib/actions/build.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@
inherit (super) contextFreeDrv;
in
currentSystem: target: let
pkgs = nixpkgs.legacyPackages.${currentSystem};
args = {
targetDrv = target.drvPath;
proviso = nixpkgs.substituteAll {
proviso = pkgs.substituteAll {
src = ./build-proviso.sh;
filter = ./build-filter.jq;
extractor = ./build-uncached-extractor.sed;
Expand Down
4 changes: 3 additions & 1 deletion lib/blockTypes/containers.nix
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ in
target,
}: let
inherit (n2c.packages.${currentSystem}) skopeo-nix2container;
inherit (nixpkgs.legacyPackages.${currentSystem}) pkgs;

tags' =
builtins.toFile "${target.name}-tags.json" (builtins.concatStringsSep "\n" target.image.tags);
copyFn = let
Expand Down Expand Up @@ -65,7 +67,7 @@ in
copy docker://${target.image.repo}
'' {
meta.image = target.image.name;
proviso = nixpkgs.substituteAll {
proviso = pkgs.substituteAll {
src = ./containers-proviso.sh;
filter = ./containers-publish-filter.jq;
};
Expand Down

0 comments on commit 9339bb5

Please sign in to comment.