From ea91c95ecff099ef81d0023e56627d289dd8b125 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 29 Apr 2015 06:59:14 +0200
Subject: 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>
---
 machines/labnet/labtop.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'machines/labnet/labtop.nix')

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" ];
 
-- 
cgit 1.4.1