From 296e6c499199b32315c071654b3dee7f40adb1a4 Mon Sep 17 00:00:00 2001 From: "Nicolas B. Pierron" Date: Wed, 8 Apr 2015 23:12:11 +0200 Subject: Fix #7252 - NixOS Manual: Carry the current system value to evaluation of the manual. --- nixos/modules/misc/nixpkgs.nix | 4 ++-- nixos/modules/services/misc/nixos-manual.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'nixos') 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 { -- cgit 1.4.1