about summary refs log tree commit diff
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2014-04-21 22:46:36 +0200
committeraszlig <aszlig@redmoonstudios.org>2014-04-21 22:51:27 +0200
commitef068c0ff94463a8f52db14046bba6ce0991a829 (patch)
tree6f2d3d4bc0d3b97212f866eb62ea22cf6141295d
parent2a2e33ea763bd49eb6e55a90e0d2707187681b7f (diff)
collections: Don't use NSAPI wrapper for Chromium.
We're now using the PepperAPI Flash version, which is mainly for testing
purposes. In the long run, the goal is to get rid of Flash entirely.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
-rw-r--r--collections/aszlig.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/collections/aszlig.nix b/collections/aszlig.nix
index 0f9a98ff..85c05899 100644
--- a/collections/aszlig.nix
+++ b/collections/aszlig.nix
@@ -105,7 +105,10 @@ with pkgs;
   ];
 
   misc = [
-    chromiumBetaWrapper
+    (chromiumBeta.override {
+      enablePepperFlash = true;
+      enablePepperPDF = true;
+    })
     firefox
     ghostscript
     gimp