public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* More refactoring.

Browse Source 
svn path=/nixos/trunk/; revision=7316
This commit is contained in:
Eelco Dolstra 2006-12-11 15:47:30 +00:00
parent ce29e4efc7
commit 7573a88ca6
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
configuration/boot-environment.nix
View File

@ -4,10 +4,16 @@
, rootLabel ? "" , rootLabel ? ""
, stage2Init , stage2Init
, readOnlyRoot , readOnlyRoot
, configData ? {}
}: }:
rec { rec {
# Make a configuration object from which we can retrieve option
# values.
config = import ./config.nix pkgs.library configData;
pkgs = import ../pkgs/top-level/all-packages.nix {inherit system;}; pkgs = import ../pkgs/top-level/all-packages.nix {inherit system;};
pkgsDiet = import ../pkgs/top-level/all-packages.nix { pkgsDiet = import ../pkgs/top-level/all-packages.nix {
@ -113,7 +119,9 @@ rec {
inherit pkgs upstartJobs; inherit pkgs upstartJobs;
}; };
# The wrapper setuid programs (since we can't have setuid programs
# in the Nix store).
setuidWrapper = import ../helpers/setuid { setuidWrapper = import ../helpers/setuid {
inherit (pkgs) stdenv; inherit (pkgs) stdenv;
wrapperDir = "/var/setuid-wrappers"; wrapperDir = "/var/setuid-wrappers";
@ -201,14 +209,4 @@ rec {
]; ];
}; };
config = import ./config.nix pkgs.library configData;
# The user configuration.
configData = {
networking = {
hostname = "nixos";
};
};
} }