summary refs log tree commit diff
path: root/modules/misc/nixpkgs.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2011-10-25 01:59:39 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2011-10-25 01:59:39 +0000
commita82bfec343c0521147b67fb92766574fa0ef0c4c (patch)
tree1ad8ebc8734d5bf55679e94aa8f77c0c909fbbba /modules/misc/nixpkgs.nix
parent49adbed5109f3458c7cbe0beb71adf68e85421ea (diff)
downloadnixpkgs-a82bfec343c0521147b67fb92766574fa0ef0c4c.tar
nixpkgs-a82bfec343c0521147b67fb92766574fa0ef0c4c.tar.gz
nixpkgs-a82bfec343c0521147b67fb92766574fa0ef0c4c.tar.bz2
nixpkgs-a82bfec343c0521147b67fb92766574fa0ef0c4c.tar.lz
nixpkgs-a82bfec343c0521147b67fb92766574fa0ef0c4c.tar.xz
nixpkgs-a82bfec343c0521147b67fb92766574fa0ef0c4c.tar.zst
nixpkgs-a82bfec343c0521147b67fb92766574fa0ef0c4c.zip
* Add an option ‘deployment.ec2.zone’. For EC2 deployments, this
  automatically sets ‘deployment.ec2.controller’ and
  ‘deployment.ec2.ami’ to sensible values.

svn path=/nixos/trunk/; revision=30005
Diffstat (limited to 'modules/misc/nixpkgs.nix')
-rw-r--r--modules/misc/nixpkgs.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix
index 2530b5af3e5..3154c3dd1e7 100644
--- a/modules/misc/nixpkgs.nix
+++ b/modules/misc/nixpkgs.nix
@@ -59,7 +59,7 @@ in
     };
 
     nixpkgs.system = mkOption {
-      default = "";
+      default = pkgs.stdenv.system;
       description = ''
         Specifies the Nix platform type for which NixOS should be built.
         If unset, it defaults to the platform type of your host system