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

Fix #7252 - NixOS Manual: Carry the current system value to evaluation of the manual.

Browse Source
This commit is contained in:
Nicolas B. Pierron 2015-04-08 23:12:11 +02:00
parent 3eef61a6eb
commit 296e6c4991
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/misc/nixpkgs.nix
View File

@ -59,8 +59,8 @@ in
}; };
nixpkgs.system = mkOption { nixpkgs.system = mkOption {
type = types.str; type = types.uniq types.str;
default = builtins.currentSystem; example = "i686-linux";
description = '' description = ''
Specifies the Nix platform type for which NixOS should be built. Specifies the Nix platform type for which NixOS should be built.
If unset, it defaults to the platform type of your host system. If unset, it defaults to the platform type of your host system.

1
nixos/modules/services/misc/nixos-manual.nix
View File

@ -14,6 +14,7 @@ let
versionModule = versionModule =
{ system.nixosVersionSuffix = config.system.nixosVersionSuffix; { system.nixosVersionSuffix = config.system.nixosVersionSuffix;
system.nixosRevision = config.system.nixosRevision; system.nixosRevision = config.system.nixosRevision;
nixpkgs.system = config.nixpkgs.system;
}; };
eval = evalModules { eval = evalModules {