diff options
| author | Aneesh Agrawal <aneeshusa@gmail.com> | 2017-01-31 03:38:02 -0500 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-01-31 09:38:02 +0100 |
| commit | 68b4a1f669e2ca95ebbb3f80631952a7168214f1 (patch) | |
| tree | 285dee367c51d0195e99b1508c949cd40bda5fc9 /nixos/modules/misc/nixpkgs.nix | |
| parent | d409d239459bbe0dabe9bff854ea15b4b12f10d5 (diff) | |
| download | nixpkgs-68b4a1f669e2ca95ebbb3f80631952a7168214f1.tar nixpkgs-68b4a1f669e2ca95ebbb3f80631952a7168214f1.tar.gz nixpkgs-68b4a1f669e2ca95ebbb3f80631952a7168214f1.tar.bz2 nixpkgs-68b4a1f669e2ca95ebbb3f80631952a7168214f1.tar.lz nixpkgs-68b4a1f669e2ca95ebbb3f80631952a7168214f1.tar.xz nixpkgs-68b4a1f669e2ca95ebbb3f80631952a7168214f1.tar.zst nixpkgs-68b4a1f669e2ca95ebbb3f80631952a7168214f1.zip | |
nixos: Respect nixpkgs.overlays (#22221)
Diffstat (limited to 'nixos/modules/misc/nixpkgs.nix')
| -rw-r--r-- | nixos/modules/misc/nixpkgs.nix | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 7451888484f..b8824e6374b 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -45,9 +45,8 @@ let in { - options = { - - nixpkgs.config = mkOption { + options.nixpkgs = { + config = mkOption { default = {}; example = literalExample '' @@ -61,7 +60,7 @@ in ''; }; - nixpkgs.overlays = mkOption { + overlays = mkOption { default = []; example = literalExample '' @@ -85,7 +84,7 @@ in ''; }; - nixpkgs.system = mkOption { + system = mkOption { type = types.str; example = "i686-linux"; description = '' @@ -95,14 +94,9 @@ in multi-platform deployment, or when building virtual machines. ''; }; - }; config = { - _module.args.pkgs = import ../../.. { - system = config.nixpkgs.system; - - inherit (config.nixpkgs) config; - }; + _module.args.pkgs = import ../../.. config.nixpkgs; }; } |