diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-04-05 15:22:45 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-04-06 12:41:44 -0400 |
| commit | c6f7d4367894047592cc412740f0c1f5b2ca2b59 (patch) | |
| tree | 0079c8f9633c2c48e2e57459eb4e40ee17bb31f8 /nixos/modules/services/misc | |
| parent | 15a2dca15c25279843374003c8ae553e3b4af385 (diff) | |
| download | nixlib-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/modules/services/misc')
| -rw-r--r-- | nixos/modules/services/misc/dysnomia.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/misc/nixos-manual.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/misc/dysnomia.nix b/nixos/modules/services/misc/dysnomia.nix index 25cd0038e36d..9e66e0811ab7 100644 --- a/nixos/modules/services/misc/dysnomia.nix +++ b/nixos/modules/services/misc/dysnomia.nix @@ -158,7 +158,7 @@ in services.dysnomia.properties = { hostname = config.networking.hostName; - system = if config.nixpkgs.system == "" then builtins.currentSystem else config.nixpkgs.system; + inherit (config.nixpkgs.localSystem) system; supportedTypes = (import "${pkgs.stdenv.mkDerivation { name = "supportedtypes"; diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix index abf506ea7c67..4bd1c20edf71 100644 --- a/nixos/modules/services/misc/nixos-manual.nix +++ b/nixos/modules/services/misc/nixos-manual.nix @@ -23,7 +23,7 @@ let options = let scrubbedEval = evalModules { - modules = [ { nixpkgs.system = config.nixpkgs.system; } ] ++ baseModules; + modules = [ { nixpkgs.localSystem = config.nixpkgs.localSystem; } ] ++ baseModules; args = (config._module.args) // { modules = [ ]; }; specialArgs = { pkgs = scrubDerivations "pkgs" pkgs; }; }; |