about summary refs log tree commit diff
path: root/modules
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2015-04-29 06:24:40 +0200
committeraszlig <aszlig@redmoonstudios.org>2015-04-29 06:24:40 +0200
commit23a7bc6a7590ebced5828e09c09d6e7a39188d74 (patch)
tree5e14ae67b83b02df5ef6243e9e99830c24c756d5 /modules
parent4d1787da3fa6bacc8a187fad8a01414011ea1f34 (diff)
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>
Diffstat (limited to 'modules')
-rw-r--r--modules/user/aszlig/services/i3/conky.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/modules/user/aszlig/services/i3/conky.nix b/modules/user/aszlig/services/i3/conky.nix
index 129890c4..d9d44409 100644
--- a/modules/user/aszlig/services/i3/conky.nix
+++ b/modules/user/aszlig/services/i3/conky.nix
@@ -1,4 +1,7 @@
-{ pkgs ? import <nixpkgs> {}, lib ? import <nixpkgs/lib>, timeout ? 300 }:
+{ pkgs ? import (import ../../../../../nixpkgs-path.nix) {}
+, lib ? import "${import ../../../../../nixpkgs-path.nix}/lib"
+, timeout ? 300
+}:
 
 with lib;