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

build-support/buildenv: Hoist builder instantiation
2024-01-04 12:32:40 +13:00
parent 054533f5c8 dda7578745
commit dbc85690de
1 changed files with 7 additions and 7 deletions
@@ -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