From 23a7bc6a7590ebced5828e09c09d6e7a39188d74 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 29 Apr 2015 06:24:40 +0200
Subject: Handle all <nixpkgs> paths with nixpkgs-path.nix.

This file is just defaulting to <nixpkgs>, but we're going to substitue
it by the channel generator. We also need to make sure that we don't
have any other references to <nixpkgs>, but the latter can best be done
on Hydra's side if we don't make <nixpkgs> available to vuizvui builds.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 machines/aszlig/arilou.nix | 4 ++--
 machines/default.nix       | 2 +-
 machines/labnet/labtop.nix | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'machines')

diff --git a/machines/aszlig/arilou.nix b/machines/aszlig/arilou.nix
index 96edf39c..47664a18 100644
--- a/machines/aszlig/arilou.nix
+++ b/machines/aszlig/arilou.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, lib, modulesPath, ... }:
 
 with lib;
 
@@ -8,7 +8,7 @@ let
   diskID = "usb-Lexar_USB_Flash_Drive_201303211246293590E4-0:0";
 in {
   vuizvui.user.aszlig.profiles.workstation.enable = true;
-  imports = [ <nixpkgs/nixos/modules/profiles/all-hardware.nix> ];
+  imports = [ "${modulesPath}/profiles/all-hardware.nix" ];
 
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;
diff --git a/machines/default.nix b/machines/default.nix
index d8fbe87f..b2445cdc 100644
--- a/machines/default.nix
+++ b/machines/default.nix
@@ -3,7 +3,7 @@
 let
   callMachine = path: rec {
     config = import path;
-    build = import <nixpkgs/nixos/lib/eval-config.nix> {
+    build = import "${import ../nixpkgs-path.nix}/nixos/lib/eval-config.nix" {
       inherit system;
       modules = [ config ] ++ import ../modules/module-list.nix;
     };
diff --git a/machines/labnet/labtop.nix b/machines/labnet/labtop.nix
index 56fbbebf..ac11f224 100644
--- a/machines/labnet/labtop.nix
+++ b/machines/labnet/labtop.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ pkgs, lib, modulesPath, ... }:
 
 let
   greybird = pkgs.stdenv.mkDerivation {
@@ -24,7 +24,7 @@ let
   };
 
 in {
-  imports = [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix> ];
+  imports = [ "${modulesPath}/installer/scan/not-detected.nix" ];
 
   boot.loader.grub.device = "/dev/disk/by-id/ata-HITACHI_HTS722010K9SA00_080711DP0270DPGLVMPC";
 
-- 
cgit 1.4.1