* Added an option "nixpkgs.system" to specify the system type for

  which NixOS should be built.  This is useful in NixOS network
  specifications, because it allows machines in the network to have
  different types, e.g.,

    {
      machine1 =
        { config, pkgs, ... }:
        { nixpkgs.system = "i686-linux";
          ... other config ...
        };

      machine2 =
        { config, pkgs, ... }:
        { nixpkgs.system = "x86_64-linux";
          ... other config ...
        };
    }

  It can also be useful in distributed NixOS tests.

svn path=/nixos/trunk/; revision=24823

1 files changed, 11 insertions, 0 deletions

diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix
index 8173d716d84..d940b32dbd5 100644
--- a/modules/misc/nixpkgs.nix
+++ b/modules/misc/nixpkgs.nix
@@ -13,6 +13,17 @@
       '';
     };
 
+    nixpkgs.system = pkgs.lib.mkOption {
+      default = "";
+      description = ''
+        Specifies the Nix platform type for which NixOS should be built.
+        If unset, it defaults to the platform type of your host system
+        (<literal>${builtins.currentSystem}</literal>).
+        Specifying this option is useful when doing distributed
+        multi-platform deployment, or when building virtual machines.
+      '';
+    };
+
     nixpkgs.platform = pkgs.lib.mkOption {
       default = pkgs.platforms.pc;
       description = ''