diff options
| author | Dan Peebles <pumpkin@me.com> | 2015-06-06 22:38:08 +0000 |
|---|---|---|
| committer | Dan Peebles <pumpkin@me.com> | 2015-06-08 01:55:49 +0000 |
| commit | b13cb5461433ccf7ae1a2e8d2691c3111441e984 (patch) | |
| tree | b53923944406959f21125ab79356c1c3c26212ea /nixos | |
| parent | 514a9fdf878a65bca0e329cbb733070f3bd0ab0f (diff) | |
| download | nixlib-b13cb5461433ccf7ae1a2e8d2691c3111441e984.tar nixlib-b13cb5461433ccf7ae1a2e8d2691c3111441e984.tar.gz nixlib-b13cb5461433ccf7ae1a2e8d2691c3111441e984.tar.bz2 nixlib-b13cb5461433ccf7ae1a2e8d2691c3111441e984.tar.lz nixlib-b13cb5461433ccf7ae1a2e8d2691c3111441e984.tar.xz nixlib-b13cb5461433ccf7ae1a2e8d2691c3111441e984.tar.zst nixlib-b13cb5461433ccf7ae1a2e8d2691c3111441e984.zip | |
Bring an importable modulesPath back from the dead, in the only way I know
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; |