diff options
| author | Daniel Peebles <copumpkin@users.noreply.github.com> | 2015-06-10 12:32:04 -0400 |
|---|---|---|
| committer | Daniel Peebles <copumpkin@users.noreply.github.com> | 2015-06-10 12:32:04 -0400 |
| commit | 6e73884c31e23c1b71fdeb61b50cce56aa43f0bb (patch) | |
| tree | b1b507a0c27a564587d9d118aea0185cc45474fe /nixos | |
| parent | 330758e7886a7e1520056637dc4fa2a5bed4755a (diff) | |
| parent | b13cb5461433ccf7ae1a2e8d2691c3111441e984 (diff) | |
| download | nixlib-6e73884c31e23c1b71fdeb61b50cce56aa43f0bb.tar nixlib-6e73884c31e23c1b71fdeb61b50cce56aa43f0bb.tar.gz nixlib-6e73884c31e23c1b71fdeb61b50cce56aa43f0bb.tar.bz2 nixlib-6e73884c31e23c1b71fdeb61b50cce56aa43f0bb.tar.lz nixlib-6e73884c31e23c1b71fdeb61b50cce56aa43f0bb.tar.xz nixlib-6e73884c31e23c1b71fdeb61b50cce56aa43f0bb.tar.zst nixlib-6e73884c31e23c1b71fdeb61b50cce56aa43f0bb.zip | |
Merge pull request #8204 from copumpkin/modulesPath
An importable modulesPath, once again
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/lib/eval-config.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/misc/extra-arguments.nix | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index adacbd0863e3..97cb85a957f6 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -47,6 +47,7 @@ in rec { inherit prefix check; modules = modules ++ extraModules ++ baseModules ++ [ pkgsModule ]; args = extraArgs; + specialArgs = { modulesPath = ../modules; }; }) config options; # These are the extra arguments passed to every module. In diff --git a/nixos/modules/misc/extra-arguments.nix b/nixos/modules/misc/extra-arguments.nix index c2c8903546d5..ff2ff7cd4322 100644 --- a/nixos/modules/misc/extra-arguments.nix +++ b/nixos/modules/misc/extra-arguments.nix @@ -2,8 +2,6 @@ { _module.args = { - modulesPath = ../.; - pkgs_i686 = import ../../lib/nixpkgs.nix { system = "i686-linux"; config.allowUnfree = true; |