From 9e6427567f540f75baf2e47fe6f8e6607d31cabc Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 4 Aug 2014 02:14:51 +0200
Subject: Move all aszligEnv packages to systemPackages.

As we have a build farm at our disposal, it really makes sense to put
the whole set of packages + overrides into systemPackages. The new
packages list is now sorted by name rather than category so it's easier
to spot duplicates.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixpkgs/config.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'nixpkgs')

diff --git a/nixpkgs/config.nix b/nixpkgs/config.nix
index ca1d33f3..45d3de5f 100644
--- a/nixpkgs/config.nix
+++ b/nixpkgs/config.nix
@@ -1,13 +1,10 @@
 {
   pulseaudio = true;
-  chromium.jre = true;
+  chromium.enablePepperFlash = true;
   firefox.jre = true;
 
   # Needed for CPU microcode
   allowUnfree = true;
 
-  packageOverrides = pkgs: let
-    mainOverrides = import ../overrides pkgs;
-    envs = import ../envs (pkgs // mainOverrides);
-  in mainOverrides // envs;
+  packageOverrides = import ../overrides;
 }
-- 
cgit 1.4.1