nixos: Respect nixpkgs.overlays (#22221)

This commit is contained in:
Aneesh Agrawal 2017-01-31 03:38:02 -05:00 committed by Franz Pletz
parent d409d23945
commit 68b4a1f669

View file

@ -45,9 +45,8 @@ let
in in
{ {
options = { options.nixpkgs = {
config = mkOption {
nixpkgs.config = mkOption {
default = {}; default = {};
example = literalExample example = literalExample
'' ''
@ -61,7 +60,7 @@ in
''; '';
}; };
nixpkgs.overlays = mkOption { overlays = mkOption {
default = []; default = [];
example = literalExample example = literalExample
'' ''
@ -85,7 +84,7 @@ in
''; '';
}; };
nixpkgs.system = mkOption { system = mkOption {
type = types.str; type = types.str;
example = "i686-linux"; example = "i686-linux";
description = '' description = ''
@ -95,14 +94,9 @@ in
multi-platform deployment, or when building virtual machines. multi-platform deployment, or when building virtual machines.
''; '';
}; };
}; };
config = { config = {
_module.args.pkgs = import ../../.. { _module.args.pkgs = import ../../.. config.nixpkgs;
system = config.nixpkgs.system;
inherit (config.nixpkgs) config;
};
}; };
} }