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 /envs/default.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 'envs/default.nix')
-rw-r--r-- | envs/default.nix | 10 |
1 files changed, 6 insertions, 4 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; + }; } |