mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 07:00:43 +00:00
Code Issues 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 ? ""
, stage2Init
, readOnlyRoot
, configData ? {}
}:
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;};
pkgsDiet = import ../pkgs/top-level/all-packages.nix {
@ -113,7 +119,9 @@ rec {
inherit pkgs upstartJobs;
};
# The wrapper setuid programs (since we can't have setuid programs
# in the Nix store).
setuidWrapper = import ../helpers/setuid {
inherit (pkgs) stdenv;
wrapperDir = "/var/setuid-wrappers";
@ -201,14 +209,4 @@ rec {
];
};
config = import ./config.nix pkgs.library configData;
# The user configuration.
configData = {
networking = {
hostname = "nixos";
};
};
}