diff options
author | aszlig <aszlig@redmoonstudios.org> | 2015-04-29 06:59:14 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2015-04-29 06:59:14 +0200 |
commit | ea91c95ecff099ef81d0023e56627d289dd8b125 (patch) | |
tree | 2a77166894ee98ce933a717e6f6146782cfafe4a /machines/labnet | |
parent | 29f2e5a8680176ce3407285ce1af702196e6ebb0 (diff) |
machines: Work around NixOS/nixpkgs#7272.
This causes an infinite recursion on evaluation if we import something from a module argument. So until we have an importsArgs module attribute we're going to refer to ../../nixpkgs-path.nix. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'machines/labnet')
-rw-r--r-- | machines/labnet/labtop.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/machines/labnet/labtop.nix b/machines/labnet/labtop.nix index ac11f224..542f0576 100644 --- a/machines/labnet/labtop.nix +++ b/machines/labnet/labtop.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, modulesPath, ... }: +{ pkgs, lib, ... }: let greybird = pkgs.stdenv.mkDerivation { @@ -23,6 +23,8 @@ let ''; }; + modulesPath = "${import ../../nixpkgs-path.nix}/nixos/modules"; + in { imports = [ "${modulesPath}/installer/scan/not-detected.nix" ]; |