diff options
author | adisbladis <adisbladis@gmail.com> | 2024-01-04 12:32:40 +1300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-04 12:32:40 +1300 |
commit | dbc85690de31536cf5711b648e4d17eeb1c18edb (patch) | |
tree | 593e671340fcd80d9e138ae70a87b9cb0b127244 /pkgs/build-support | |
parent | 054533f5c84884e3186a722c07cbb4a6c1a2af19 (diff) | |
parent | dda7578745d1d5eddf70068a4a161b24fbe17751 (diff) | |
download | nixlib-dbc85690de31536cf5711b648e4d17eeb1c18edb.tar nixlib-dbc85690de31536cf5711b648e4d17eeb1c18edb.tar.gz nixlib-dbc85690de31536cf5711b648e4d17eeb1c18edb.tar.bz2 nixlib-dbc85690de31536cf5711b648e4d17eeb1c18edb.tar.lz nixlib-dbc85690de31536cf5711b648e4d17eeb1c18edb.tar.xz nixlib-dbc85690de31536cf5711b648e4d17eeb1c18edb.tar.zst nixlib-dbc85690de31536cf5711b648e4d17eeb1c18edb.zip |
Merge pull request #277335 from adisbladis/buildenv-hoist-instantiation
build-support/buildenv: Hoist builder instantiation
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/buildenv/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix index 786a2ad5da02..560f59bcce7d 100644 --- a/pkgs/build-support/buildenv/default.nix +++ b/pkgs/build-support/buildenv/default.nix @@ -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 |