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>

1 files changed, 4 insertions, 1 deletions

diff --git a/nixpkgs/config.nix b/nixpkgs/config.nix
index e660df17..70b6c96c 100644
--- a/nixpkgs/config.nix
+++ b/nixpkgs/config.nix
@@ -5,5 +5,8 @@
 
   firefox.jre = true;
 
-  packageOverrides = import ../overrides;
+  packageOverrides = pkgs: let
+    mainOverrides = import ../overrides pkgs;
+    envs = import ../envs (pkgs // mainOverrides);
+  in mainOverrides // envs;
 }