From 6fba674ea11f017578a1df6e79e29e7a9399f6a4 Mon Sep 17 00:00:00 2001 From: aszlig 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 --- nixpkgs/config.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'nixpkgs') 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; } -- cgit 1.4.1