mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 16:03:23 +00:00
svn path=/nixos/branches/modular-nixos/; revision=16592
This commit is contained in:
parent
02c119a104
commit
a9071b3283
@ -6,8 +6,11 @@
|
||||
, system ? builtins.currentSystem
|
||||
, nixpkgs ? import ./from-env.nix "NIXPKGS" /etc/nixos/nixpkgs
|
||||
, pkgs ? import nixpkgs {inherit system;}
|
||||
, extraArgs ? {}
|
||||
}:
|
||||
|
||||
let extraArgs_ = extraArgs; in
|
||||
|
||||
rec {
|
||||
inherit nixpkgs pkgs;
|
||||
|
||||
@ -16,7 +19,7 @@ rec {
|
||||
./check-config.nix
|
||||
] ++ (import ../modules/module-list.nix);
|
||||
|
||||
extraArgs = {
|
||||
extraArgs = extraArgs_ // {
|
||||
inherit pkgs;
|
||||
modulesPath = ../modules;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user