From a51bcb2528c1618d1f1506f3bb7374309f7bd9df Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 14 Jan 2013 06:32:46 +0100
Subject: nixpkgs: Move aszlig-env into ../envs.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 envs/default.nix      | 15 +++++++++++++++
 nixpkgs/config.nix    | 11 +----------
 overrides/default.nix |  7 +------
 3 files changed, 17 insertions(+), 16 deletions(-)
 create mode 100644 envs/default.nix

diff --git a/envs/default.nix b/envs/default.nix
new file mode 100644
index 00000000..13813efb
--- /dev/null
+++ b/envs/default.nix
@@ -0,0 +1,15 @@
+pkgs:
+
+{
+  aszligEnv = (pkgs.buildEnv {
+    name = "aszlig-env";
+    paths = let
+      genAszligEnv = name: paths: pkgs.buildEnv {
+        name = "aszlig-${name}-packages";
+        inherit paths;
+        ignoreCollisions = true;
+      };
+      collection = import ../collections/aszlig.nix pkgs;
+    in pkgs.lib.mapAttrsToList genAszligEnv collection;
+  });
+}
diff --git a/nixpkgs/config.nix b/nixpkgs/config.nix
index cfb30f26..e660df17 100644
--- a/nixpkgs/config.nix
+++ b/nixpkgs/config.nix
@@ -1,13 +1,4 @@
-let
-  aszligCollections = pkgs: let
-    genAszligEnv = name: paths: pkgs.buildEnv {
-      name = "aszlig-${name}-packages";
-      inherit paths;
-      ignoreCollisions = true;
-    };
-    collection = import ../collections/aszlig.nix pkgs;
-  in pkgs.lib.mapAttrsToList genAszligEnv collection;
-in {
+{
   pulseaudio = true;
   chromium.enableGoogleTalkPlugin = true;
   chromium.jre = true;
diff --git a/overrides/default.nix b/overrides/default.nix
index 0052de0c..e2f0ce1a 100644
--- a/overrides/default.nix
+++ b/overrides/default.nix
@@ -4,11 +4,6 @@ with {
   tkabberRev = 2009;
 };
 with pkgs; let p = {
-  aszligEnv = (buildEnv {
-    name = "aszlig-env";
-    paths = aszligCollections (pkgs // p);
-  });
-
   pulseaudio = pulseaudio.override {
     useSystemd = true;
   };
@@ -283,4 +278,4 @@ with pkgs; let p = {
       sha256 = "1zc3bpqfa5pdpl7masigvv98mi5phl04p80fyd2ink33xbmik70z";
     };
   };
-}; in p
+}; in p // (import ../envs (pkgs // p))
-- 
cgit 1.4.1