summary refs log tree commit diff
path: root/nixos/lib
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2018-04-05 15:22:45 -0400
committerJohn Ericson <John.Ericson@Obsidian.Systems>2018-04-06 12:41:44 -0400
commitc6f7d4367894047592cc412740f0c1f5b2ca2b59 (patch)
tree0079c8f9633c2c48e2e57459eb4e40ee17bb31f8 /nixos/lib
parent15a2dca15c25279843374003c8ae553e3b4af385 (diff)
downloadnixlib-c6f7d4367894047592cc412740f0c1f5b2ca2b59.tar
nixlib-c6f7d4367894047592cc412740f0c1f5b2ca2b59.tar.gz
nixlib-c6f7d4367894047592cc412740f0c1f5b2ca2b59.tar.bz2
nixlib-c6f7d4367894047592cc412740f0c1f5b2ca2b59.tar.lz
nixlib-c6f7d4367894047592cc412740f0c1f5b2ca2b59.tar.xz
nixlib-c6f7d4367894047592cc412740f0c1f5b2ca2b59.tar.zst
nixlib-c6f7d4367894047592cc412740f0c1f5b2ca2b59.zip
nixpkgs module: Clean up platform options
 - `localSystem` is added, it strictly supercedes system

 - `crossSystem`'s description mentions `localSystem` (and vice versa).

 - No more weird special casing I don't even understand

TEMP
Diffstat (limited to 'nixos/lib')
-rw-r--r--nixos/lib/eval-config.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix
index 2e7971cca810..97c79487df4c 100644
--- a/nixos/lib/eval-config.nix
+++ b/nixos/lib/eval-config.nix
@@ -26,7 +26,7 @@
 , lib ? import ../../lib
 }:
 
-let extraArgs_ = extraArgs; pkgs_ = pkgs; system_ = system;
+let extraArgs_ = extraArgs; pkgs_ = pkgs;
     extraModules = let e = builtins.getEnv "NIXOS_EXTRA_MODULE_PATH";
                    in if e == "" then [] else [(import (builtins.toPath e))];
 in
@@ -36,7 +36,7 @@ let
     _file = ./eval-config.nix;
     key = _file;
     config = {
-      nixpkgs.system = lib.mkDefault system_;
+      nixpkgs.localSystem = lib.mkDefault { inherit system; };
       _module.args.pkgs = lib.mkIf (pkgs_ != null) (lib.mkForce pkgs_);
     };
   };