mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-03 06:19:10 +03:00
Adding a possibility to add more paths to chroots used by nix-daemons. The use-case is building the latest version from repository with very large checkouts. That way you do not get extra copy in store every time you rebuild, and you can implement a saner version checking than checksumming all the data
svn path=/nixos/trunk/; revision=26174
This commit is contained in:
parent
0c6129bb90
commit
00f3a816a9
1 changed files with 11 additions and 2 deletions
|
@ -69,6 +69,16 @@ in
|
||||||
This option allows to append lines to nix.conf.
|
This option allows to append lines to nix.conf.
|
||||||
";
|
";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
extraChrootPaths = mkOption {
|
||||||
|
default = [];
|
||||||
|
example = ["/var/dist"];
|
||||||
|
description = ''
|
||||||
|
Extra paths to include in chroot. May be useful if you build
|
||||||
|
from private repository mirrors to avoid extra checksumming
|
||||||
|
and copying to store.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
distributedBuilds = mkOption {
|
distributedBuilds = mkOption {
|
||||||
default = false;
|
default = false;
|
||||||
|
@ -176,7 +186,6 @@ in
|
||||||
you should increase this value.
|
you should increase this value.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -211,7 +220,7 @@ in
|
||||||
build-users-group = nixbld
|
build-users-group = nixbld
|
||||||
build-max-jobs = ${toString (config.nix.maxJobs)}
|
build-max-jobs = ${toString (config.nix.maxJobs)}
|
||||||
build-use-chroot = ${if config.nix.useChroot then "true" else "false"}
|
build-use-chroot = ${if config.nix.useChroot then "true" else "false"}
|
||||||
build-chroot-dirs = /dev /dev/pts /proc /bin $(echo $extraPaths)
|
build-chroot-dirs = /dev /dev/pts /proc /bin $(echo $extraPaths) ${builtins.toString config.nix.extraChrootPaths}
|
||||||
$extraOptions
|
$extraOptions
|
||||||
END
|
END
|
||||||
'';
|
'';
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue