summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authortaku0 <taku0@users.noreply.github.com>2016-12-25 20:32:24 +0900
committerzimbatm <zimbatm@zimbatm.com>2016-12-25 11:32:24 +0000
commitf3287b0aa53e9ff4ec61b3d8d5ed52f193540506 (patch)
treec7f0c16cfdbef29d789e4a2c448763a5d085c406 /pkgs/top-level
parent4383aa26f21a7bc344a4f08dcc987e96b8f86cde (diff)
downloadnixlib-f3287b0aa53e9ff4ec61b3d8d5ed52f193540506.tar
nixlib-f3287b0aa53e9ff4ec61b3d8d5ed52f193540506.tar.gz
nixlib-f3287b0aa53e9ff4ec61b3d8d5ed52f193540506.tar.bz2
nixlib-f3287b0aa53e9ff4ec61b3d8d5ed52f193540506.tar.lz
nixlib-f3287b0aa53e9ff4ec61b3d8d5ed52f193540506.tar.xz
nixlib-f3287b0aa53e9ff4ec61b3d8d5ed52f193540506.tar.zst
nixlib-f3287b0aa53e9ff4ec61b3d8d5ed52f193540506.zip
flashplayer: 11.2.202.644 -> 24.0.0.186 [Critical security fix] (#21337)
* flashplayer: 11.2.202.644 -> 24.0.0.186

* flashplayer: add debug version

* flashplayer-standalone: 11.2.202.644 -> 24.0.0.186
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix12
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c204a37c8399..3739c89f6513 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13151,13 +13151,17 @@ in
 
   flac = callPackage ../applications/audio/flac { };
 
-  flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-11 {
-    debug = config.flashplayer.debug or false;
+  flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer {
+      debug = config.flashplayer.debug or false;
   };
 
-  flashplayer-standalone = pkgsi686Linux.flashplayer.sa;
+  flashplayer-standalone = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix {
+      debug = config.flashplayer.debug or false;
+  };
 
-  flashplayer-standalone-debugger = (pkgsi686Linux.flashplayer.override { debug = true; }).sa;
+  flashplayer-standalone-debugger = flashplayer-standalone.override {
+      debug = true;
+  };
 
   fluxbox = callPackage ../applications/window-managers/fluxbox { };