about summary refs log tree commit diff
path: root/nixpkgs
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs')
-rw-r--r--nixpkgs/config.nix7
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;
 }