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 ++++++----
 nixpkgs/config.nix    |  5 ++++-
 overrides/default.nix | 12 +++++++-----
 3 files changed, 17 insertions(+), 10 deletions(-)

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;
+  };
 }
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;
 }
diff --git a/overrides/default.nix b/overrides/default.nix
index e2f0ce1a..f70853ab 100644
--- a/overrides/default.nix
+++ b/overrides/default.nix
@@ -3,7 +3,9 @@ pkgs:
 with {
   tkabberRev = 2009;
 };
-with pkgs; let p = {
+with pkgs;
+
+rec {
   pulseaudio = pulseaudio.override {
     useSystemd = true;
   };
@@ -208,7 +210,7 @@ with pkgs; let p = {
     name = "axbo-research-${version}";
     version = "2.0.18";
 
-    buildInputs = [ jre p.librxtx_java ];
+    buildInputs = [ jre librxtx_java ];
 
     unpackCmd = let
       fontconfigFile = makeFontsConf {
@@ -264,8 +266,8 @@ with pkgs; let p = {
 
       cat > "$out/bin/axbo-research" <<WRAPPER
       #!${stdenv.shell}
-      ${jre}/bin/java -Djava.library.path="${p.librxtx_java}/lib" \
-        -classpath "${p.librxtx_java}/lib/java/*:$out/lib/java/*" \
+      ${jre}/bin/java -Djava.library.path="${librxtx_java}/lib" \
+        -classpath "${librxtx_java}/lib/java/*:$out/lib/java/*" \
         -jar "$out/libexec/axbo.jar"
       WRAPPER
       chmod +x "$out/bin/axbo-research"
@@ -278,4 +280,4 @@ with pkgs; let p = {
       sha256 = "1zc3bpqfa5pdpl7masigvv98mi5phl04p80fyd2ink33xbmik70z";
     };
   };
-}; in p // (import ../envs (pkgs // p))
+}
-- 
cgit 1.4.1