diff options
author | aszlig <aszlig@redmoonstudios.org> | 2013-01-14 06:44:52 +0100 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2013-01-14 06:51:28 +0100 |
commit | 6fba674ea11f017578a1df6e79e29e7a9399f6a4 (patch) | |
tree | f7b6a24de25b012540bbafe52c65680b22a14fbe /nixpkgs/config.nix | |
parent | a51bcb2528c1618d1f1506f3bb7374309f7bd9df (diff) |
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>
Diffstat (limited to 'nixpkgs/config.nix')
-rw-r--r-- | nixpkgs/config.nix | 5 |
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; } |