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>
---
 default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'default.nix')

diff --git a/default.nix b/default.nix
index c85ef72a..f2ea79e2 100644
--- a/default.nix
+++ b/default.nix
@@ -1,6 +1,6 @@
 { system ? builtins.currentSystem, ... }@args:
 
-with (import <nixpkgs> { inherit system; }).lib;
+with (import (import ./nixpkgs-path.nix) { inherit system; }).lib;
 
 {
   machines = mapAttrsRecursiveCond (m: !(m ? build)) (path: attrs:
@@ -8,9 +8,9 @@ with (import <nixpkgs> { inherit system; }).lib;
   ) (import ./machines { inherit system; });
 
   pkgs = import ./pkgs {
-    pkgs = import <nixpkgs> args;
+    pkgs = import (import ./nixpkgs-path.nix) args;
   };
 
   # Inherit upstream lib until we have our own lib.
-  lib = import <nixpkgs/lib>;
+  lib = import "${import ./nixpkgs-path.nix}/lib";
 }
-- 
cgit 1.4.1