diff options
| author | adisbladis <adisbladis@gmail.com> | 2023-12-29 03:04:46 +1300 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2024-01-03 23:33:10 +0000 |
| commit | 83eeaf01fee58fdef9f509d72f1508e6af64c707 (patch) | |
| tree | cf16d3a23fa0f45ca2442ead6f29f0373c09a369 | |
| parent | Merge pull request #278073 from NixOS/backport-263279-to-release-23.11 (diff) | |
| download | nixpkgs-83eeaf01fee58fdef9f509d72f1508e6af64c707.tar.gz | |
build-support/buildenv: Hoist builder instantiationorigin/backport-277335-to-release-23.11
(cherry picked from commit dda7578745d1d5eddf70068a4a161b24fbe17751)
| -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 |