Unverified Commit dbc85690 authored by adisbladis's avatar adisbladis Committed by GitHub
Browse files

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

build-support/buildenv: Hoist builder instantiation
parents 054533f5 dda75787

pkgs/build-support/buildenv/default.nix

+7 −7
Original line number Diff line number Diff line
@@ -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