diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2018-04-19 14:59:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-19 14:59:58 -0400 |
| commit | 53686e89951f33906cb1a8d7d5badc4671ae90e4 (patch) | |
| tree | 076559719b8cc7d959be64abf6a585f5831bc90c /nixos/modules/services | |
| parent | 7287129e51be7b99e9896c3401bd4c4c9c3dd1de (diff) | |
| parent | c6f7d4367894047592cc412740f0c1f5b2ca2b59 (diff) | |
| download | nixlib-53686e89951f33906cb1a8d7d5badc4671ae90e4.tar nixlib-53686e89951f33906cb1a8d7d5badc4671ae90e4.tar.gz nixlib-53686e89951f33906cb1a8d7d5badc4671ae90e4.tar.bz2 nixlib-53686e89951f33906cb1a8d7d5badc4671ae90e4.tar.lz nixlib-53686e89951f33906cb1a8d7d5badc4671ae90e4.tar.xz nixlib-53686e89951f33906cb1a8d7d5badc4671ae90e4.tar.zst nixlib-53686e89951f33906cb1a8d7d5badc4671ae90e4.zip | |
Merge pull request #38485 from obsidiansystems/nixos-nixpkgs-options
nixpkgs module: Clean up platform options
Diffstat (limited to 'nixos/modules/services')
| -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; }; }; |