diff options
author | aszlig <aszlig@redmoonstudios.org> | 2014-08-04 02:14:51 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2014-08-04 02:14:51 +0200 |
commit | 9e6427567f540f75baf2e47fe6f8e6607d31cabc (patch) | |
tree | 3eb008c9a9abc049f505aa97f3ba2cc703ed0cdd /nixpkgs/config.nix | |
parent | c842ed7d1c75a456cdb40066fd3d758f0a776f07 (diff) |
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>
Diffstat (limited to 'nixpkgs/config.nix')
-rw-r--r-- | nixpkgs/config.nix | 7 |
1 files changed, 2 insertions, 5 deletions
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; } |