diff options
| author | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2015-04-08 23:12:11 +0200 |
|---|---|---|
| committer | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2015-04-08 23:14:19 +0200 |
| commit | 296e6c499199b32315c071654b3dee7f40adb1a4 (patch) | |
| tree | 59a24ef8acd6725d90e17576f71e60bd43899c88 /nixos | |
| parent | 3eef61a6eb4f1f53491c94dfcb0413ef3d71c129 (diff) | |
| download | nixpkgs-296e6c499199b32315c071654b3dee7f40adb1a4.tar nixpkgs-296e6c499199b32315c071654b3dee7f40adb1a4.tar.gz nixpkgs-296e6c499199b32315c071654b3dee7f40adb1a4.tar.bz2 nixpkgs-296e6c499199b32315c071654b3dee7f40adb1a4.tar.lz nixpkgs-296e6c499199b32315c071654b3dee7f40adb1a4.tar.xz nixpkgs-296e6c499199b32315c071654b3dee7f40adb1a4.tar.zst nixpkgs-296e6c499199b32315c071654b3dee7f40adb1a4.zip | |
Fix #7252 - NixOS Manual: Carry the current system value to evaluation of the manual.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/misc/nixpkgs.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/services/misc/nixos-manual.nix | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 395ba82f2d1..114feb2562d 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -59,8 +59,8 @@ in }; nixpkgs.system = mkOption { - type = types.str; - default = builtins.currentSystem; + type = types.uniq types.str; + example = "i686-linux"; description = '' Specifies the Nix platform type for which NixOS should be built. If unset, it defaults to the platform type of your host system. diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix index f73c4102cfe..c570a01fb3b 100644 --- a/nixos/modules/services/misc/nixos-manual.nix +++ b/nixos/modules/services/misc/nixos-manual.nix @@ -14,6 +14,7 @@ let versionModule = { system.nixosVersionSuffix = config.system.nixosVersionSuffix; system.nixosRevision = config.system.nixosRevision; + nixpkgs.system = config.nixpkgs.system; }; eval = evalModules { |