From 23e84aadf1abb91291ac84f4b950e4e1f2e85c7f Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 4 Apr 2015 00:39:06 +0200
Subject: Remove references to pkgs.lib within modules.

We now no longer can (or even should) refer to pkgs.lib within modules
since the merge of the module system improvements in
NixOS/nixpkgs@889f72b.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/user/aszlig/services/i3/conky.nix   | 4 ++--
 modules/user/aszlig/services/i3/default.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules/user')

diff --git a/modules/user/aszlig/services/i3/conky.nix b/modules/user/aszlig/services/i3/conky.nix
index 5d626025..129890c4 100644
--- a/modules/user/aszlig/services/i3/conky.nix
+++ b/modules/user/aszlig/services/i3/conky.nix
@@ -1,6 +1,6 @@
-{ pkgs ? import <nixpkgs> {}, timeout ? 300 }:
+{ pkgs ? import <nixpkgs> {}, lib ? import <nixpkgs/lib>, timeout ? 300 }:
 
-with pkgs.lib;
+with lib;
 
 let
   baseConfig = pkgs.writeText "conkyrc" ''
diff --git a/modules/user/aszlig/services/i3/default.nix b/modules/user/aszlig/services/i3/default.nix
index 6064ec99..7b578026 100644
--- a/modules/user/aszlig/services/i3/default.nix
+++ b/modules/user/aszlig/services/i3/default.nix
@@ -37,7 +37,7 @@ let
   defaultWorkspaces = listToAttrs (imap mkDefaultWorkspace wsNumberSymbols);
 
   conky = import ./conky.nix {
-    inherit pkgs;
+    inherit pkgs lib;
     timeout = cfg.networkTimeout;
   };
 
-- 
cgit 1.4.1