Author: eelco
Date: Mon Mar 7 08:20:24 2011
New Revision: 26183
URL: https://svn.nixos.org/websvn/nix/?rev=26183&sc=1
Log:
* Refactor: extraChrootPaths -> chrootDirs. This allows disabling the
default chroot paths using mkOverride.
Modified:
nixos/trunk/modules/services/misc/nix-daemon.nix
Modified: nixos/trunk/modules/services/misc/nix-daemon.nix
==============================================================================
--- nixos/trunk/modules/services/misc/nix-daemon.nix Mon Mar 7 08:04:10
2011 (r26182)
+++ nixos/trunk/modules/services/misc/nix-daemon.nix Mon Mar 7 08:20:24
2011 (r26183)
@@ -59,6 +59,16 @@
";
};
+ chrootDirs = mkOption {
+ default = [];
+ example = [ "/dev" "/proc" ];
+ description =
+ ''
+ Directories from the host filesystem to be included
+ in the chroot.
+ '';
+ };
+
extraOptions = mkOption {
default = "";
example = "
@@ -70,16 +80,6 @@
";
};
- 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 {
default = false;
description = "
@@ -194,6 +194,8 @@
config = {
+ nix.chrootDirs = [ "/dev" "/dev/pts" "/proc" "/bin" ];
+
environment.etc =
[ { # Nix configuration.
source =
@@ -220,7 +222,7 @@
build-users-group = nixbld
build-max-jobs = ${toString (config.nix.maxJobs)}
build-use-chroot = ${if config.nix.useChroot then "true" else
"false"}
- build-chroot-dirs = /dev /dev/pts /proc /bin $(echo
$extraPaths) ${builtins.toString config.nix.extraChrootPaths}
+ build-chroot-dirs = ${toString config.nix.chrootDirs} $(echo
$extraPaths)
$extraOptions
END
'';
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
