ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-12 03:56:17 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/build-support/buildenv/default.nix
View File

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