From 6fba674ea11f017578a1df6e79e29e7a9399f6a4 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 14 Jan 2013 06:44:52 +0100
Subject: overrides: Completely separate environments.

Environments are now handled through nixpkgs/config.nix and get all packages
from nixpkgs plus the packageOverrides in ../overrides. So we can actually
remove "p" in overrides/default.nix which was recursively referencing the
overrides attrs.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 envs/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'envs')

diff --git a/envs/default.nix b/envs/default.nix
index 13813efb..eba7f174 100644
--- a/envs/default.nix
+++ b/envs/default.nix
@@ -1,15 +1,17 @@
 pkgs:
 
+with pkgs;
+
 {
-  aszligEnv = (pkgs.buildEnv {
+  aszligEnv = buildEnv {
     name = "aszlig-env";
     paths = let
-      genAszligEnv = name: paths: pkgs.buildEnv {
+      genAszligEnv = name: paths: buildEnv {
         name = "aszlig-${name}-packages";
         inherit paths;
         ignoreCollisions = true;
       };
       collection = import ../collections/aszlig.nix pkgs;
-    in pkgs.lib.mapAttrsToList genAszligEnv collection;
-  });
+    in lib.mapAttrsToList genAszligEnv collection;
+  };
 }
-- 
cgit 1.4.1