Merge pull request #277335 from adisbladis/buildenv-hoist-instantiation

build-support/buildenv: Hoist builder instantiation
This commit is contained in:
adisbladis 2024-01-04 12:32:40 +13:00 committed by GitHub
commit dbc85690de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3,6 +3,13 @@
{ buildPackages, runCommand, lib, substituteAll }:
let
builder = substituteAll {
src = ./builder.pl;
inherit (builtins) storeDir;
};
in
lib.makeOverridable
({ name
@ -43,13 +50,6 @@ lib.makeOverridable
, meta ? {}
}:
let
builder = substituteAll {
src = ./builder.pl;
inherit (builtins) storeDir;
};
in
runCommand name
rec {
inherit manifest ignoreCollisions checkCollisionContents passthru