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

Now configuration.nix is copied into shared.

Browse Source 
svn path=/nixos/trunk/; revision=10105
This commit is contained in:
Michael Raskin 2008-01-09 16:08:15 +00:00
parent fb92b4666d
commit f667e94752
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
default.nix
View File

@ -4,7 +4,8 @@ let
let env = builtins.getEnv "NIXOS_CONFIG"; in let env = builtins.getEnv "NIXOS_CONFIG"; in
if env == "" then /etc/nixos/configuration.nix else env; 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 in

6
system/system.nix
View File

@ -1,6 +1,7 @@
{ platform ? __currentSystem { platform ? __currentSystem
, stage2Init ? "" , stage2Init ? ""
, configuration , configuration
, configFileName ? ""
}: }:
rec { rec {
@ -246,7 +247,10 @@ rec {
++ pkgs.lib.optional (config.networking.defaultMailServer.directDelivery) pkgs.ssmtp ++ pkgs.lib.optional (config.networking.defaultMailServer.directDelivery) pkgs.ssmtp
++ pkgs.lib.concatLists (map (job: job.extraPath) upstartJobs.jobs) ++ pkgs.lib.concatLists (map (job: job.extraPath) upstartJobs.jobs)
++ (config.environment.extraPackages) pkgs ++ (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 # We don't want to put all of `startPath' and `path' in $PATH, since