Now configuration.nix is copied into shared.
svn path=/nixos/trunk/; revision=10105
This commit is contained in:
parent
fb92b4666d
commit
f667e94752
@ -4,7 +4,8 @@ let
|
||||
let env = builtins.getEnv "NIXOS_CONFIG"; in
|
||||
if env == "" then /etc/nixos/configuration.nix else env;
|
||||
|
||||
system = import system/system.nix {configuration = import configFileName;};
|
||||
system = import system/system.nix {configuration = import configFileName;
|
||||
inherit configFileName; };
|
||||
|
||||
in
|
||||
|
||||
|
@ -1,6 +1,7 @@
|
||||
{ platform ? __currentSystem
|
||||
, stage2Init ? ""
|
||||
, configuration
|
||||
, configFileName ? ""
|
||||
}:
|
||||
|
||||
rec {
|
||||
@ -246,7 +247,10 @@ rec {
|
||||
++ pkgs.lib.optional (config.networking.defaultMailServer.directDelivery) pkgs.ssmtp
|
||||
++ pkgs.lib.concatLists (map (job: job.extraPath) upstartJobs.jobs)
|
||||
++ (config.environment.extraPackages) pkgs
|
||||
++ pkgs.lib.optional (config.fonts.enableFontDir) fontDir;
|
||||
++ pkgs.lib.optional (config.fonts.enableFontDir) fontDir
|
||||
++ pkgs.lib.optional (configFileName != "" )
|
||||
(pkgs.runCommand "configuration" {} '' mkdir -p $out/share && cp "${configFileName}" $out/share/configuration.nix '')
|
||||
;
|
||||
|
||||
|
||||
# We don't want to put all of `startPath' and `path' in $PATH, since
|
||||
|
Loading…
Reference in New Issue
Block a user