From 3de724310dd6c837ac072919b141627b5574e66b Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Sun, 7 Feb 2021 14:05:53 -0800
Subject: flashplayer: drop

---
 .../mozilla-plugins/flashplayer/default.nix        | 147 ---------------------
 .../mozilla-plugins/flashplayer/standalone.nix     | 106 ---------------
 pkgs/top-level/aliases.nix                         |   3 +
 pkgs/top-level/all-packages.nix                    |   8 --
 4 files changed, 3 insertions(+), 261 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
 delete mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
deleted file mode 100644
index 1a4f9b4ec7b..00000000000
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ /dev/null
@@ -1,147 +0,0 @@
-{ stdenv
-, lib
-, fetchurl
-, alsaLib
-, atk
-, bzip2
-, cairo
-, curl
-, expat
-, fontconfig
-, freetype
-, gdk-pixbuf
-, glib
-, glibc
-, graphite2
-, gtk2
-, harfbuzz
-, libICE
-, libSM
-, libX11
-, libXau
-, libXcomposite
-, libXcursor
-, libXdamage
-, libXdmcp
-, libXext
-, libXfixes
-, libXi
-, libXinerama
-, libXrandr
-, libXrender
-, libXt
-, libXxf86vm
-, libdrm
-, libffi
-, libglvnd
-, libpng
-, libvdpau
-, libxcb
-, libxshmfence
-, nspr
-, nss
-, pango
-, pcre
-, pixman
-, zlib
-, unzip
-, debug ? false
-
-/* you have to add ~/mm.cfg :
-
-    TraceOutputFileEnable=1
-    ErrorReportingEnable=1
-    MaxWarnings=1
-
-  in order to read the flash trace at ~/.macromedia/Flash_Player/Logs/flashlog.txt
-  Then FlashBug (a FireFox plugin) shows the log as well
-*/
-
-}:
-
-let
-  arch =
-    if stdenv.hostPlatform.system == "x86_64-linux" then
-      "x86_64"
-    else if stdenv.hostPlatform.system == "i686-linux"   then
-      "i386"
-    else throw "Flash Player is not supported on this platform";
-  lib_suffix =
-      if stdenv.hostPlatform.system == "x86_64-linux" then
-      "64"
-    else
-      "";
-in
-stdenv.mkDerivation rec {
-  pname = "flashplayer";
-  version = "32.0.0.465";
-
-  src = fetchurl {
-    url =
-      if debug then
-        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_npapi_linux_debug.${arch}.tar.gz"
-      else
-        "https://fpdownload.adobe.com/get/flashplayer/pdc/${version}/flash_player_npapi_linux.${arch}.tar.gz";
-    sha256 =
-      if debug then
-        if arch == "x86_64" then
-          "04p70zc4y7k1klsxa70ngl7g5q6pf2n4018r7d5n6wg2961mjk3y"
-        else
-          "1avslj2ssp9fcvygcc8f578gpj3bbbpvap4ssr7ag6xn6mh15adw"
-      else
-        if arch == "x86_64" then
-          "0dbccg7ijlr9wdjkh6chbw0q1qchycbi1a313hrrc613k3djw3x9"
-        else
-          "1mhbkb2d6ky1xlgx55yip1l9kh5nq35jjbbm6hf6ckai146j3dr7";
-  };
-
-  nativeBuildInputs = [ unzip ];
-
-  sourceRoot = ".";
-
-  dontStrip = true;
-  dontPatchELF = true;
-
-  preferLocalBuild = true;
-
-  installPhase = ''
-    mkdir -p $out/lib/mozilla/plugins
-    cp -pv libflashplayer.so $out/lib/mozilla/plugins
-
-    mkdir -p $out/bin
-    cp -pv usr/bin/flash-player-properties $out/bin
-
-    mkdir -p $out/lib${lib_suffix}/kde4
-    cp -pv usr/lib${lib_suffix}/kde4/kcm_adobe_flash_player.so $out/lib${lib_suffix}/kde4
-
-    patchelf --set-rpath "$rpath" \
-      $out/lib/mozilla/plugins/libflashplayer.so \
-      $out/lib${lib_suffix}/kde4/kcm_adobe_flash_player.so
-
-    patchelf \
-      --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-      --set-rpath "$rpath" \
-      $out/bin/flash-player-properties
-  '';
-
-  passthru = {
-    mozillaPlugin = "/lib/mozilla/plugins";
-  };
-
-  rpath = lib.makeLibraryPath
-    [ stdenv.cc.cc
-      alsaLib atk bzip2 cairo curl expat fontconfig freetype gdk-pixbuf glib
-      glibc graphite2 gtk2 harfbuzz libICE libSM libX11 libXau libXcomposite
-      libXcursor libXdamage libXdmcp libXext libXfixes libXi libXinerama
-      libXrandr libXrender libXt libXxf86vm libdrm libffi libglvnd libpng
-      libvdpau libxcb libxshmfence nspr nss pango pcre pixman zlib
-    ];
-
-  meta = {
-    description = "Adobe Flash Player browser plugin";
-    homepage = "http://www.adobe.com/products/flashplayer/";
-    license = lib.licenses.unfree;
-    maintainers = with lib.maintainers; [ taku0 ];
-    platforms = [ "x86_64-linux" "i686-linux" ];
-  };
-}
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
deleted file mode 100644
index ed95d02ade4..00000000000
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ /dev/null
@@ -1,106 +0,0 @@
-{ stdenv
-, lib
-, fetchurl
-, alsaLib
-, atk
-, bzip2
-, cairo
-, curl
-, expat
-, fontconfig
-, freetype
-, gdk-pixbuf
-, glib
-, glibc
-, graphite2
-, gtk2
-, harfbuzz
-, libICE
-, libSM
-, libX11
-, libXau
-, libXcomposite
-, libXcursor
-, libXdamage
-, libXdmcp
-, libXext
-, libXfixes
-, libXi
-, libXinerama
-, libXrandr
-, libXrender
-, libXt
-, libXxf86vm
-, libdrm
-, libffi
-, libglvnd
-, libpng
-, libvdpau
-, libxcb
-, libxshmfence
-, nspr
-, nss
-, pango
-, pcre
-, pixman
-, zlib
-, unzip
-, debug ? false
-}:
-
-stdenv.mkDerivation {
-  pname = "flashplayer-standalone";
-  version = "32.0.0.465";
-
-  src = fetchurl {
-    url =
-      if debug then
-        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux_debug.x86_64.tar.gz"
-      else
-        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz";
-    sha256 =
-      if debug then
-        "1ija3z5bxg0ppx9r237cxs1cdrhk6pia2kcxbrm6y30kvzrd3nqs"
-      else
-        "1hwnvwph7p3nfv2xf7kjw3zdpb546dsia0cmhzg81z016fi7lgw8";
-  };
-
-  nativeBuildInputs = [ unzip ];
-
-  sourceRoot = ".";
-
-  dontStrip = true;
-  dontPatchELF = true;
-
-  preferLocalBuild = true;
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp -pv flashplayer${lib.optionalString debug "debugger"} $out/bin
-
-    patchelf \
-      --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-      --set-rpath "$rpath" \
-      $out/bin/flashplayer${lib.optionalString debug "debugger"}
-  '';
-
-  rpath = lib.makeLibraryPath
-    [ stdenv.cc.cc
-      alsaLib atk bzip2 cairo curl expat fontconfig freetype gdk-pixbuf glib
-      glibc graphite2 gtk2 harfbuzz libICE libSM libX11 libXau libXcomposite
-      libXcursor libXdamage libXdmcp libXext libXfixes libXi libXinerama
-      libXrandr libXrender libXt libXxf86vm libdrm libffi libglvnd libpng
-      libvdpau libxcb libxshmfence nspr nss pango pcre pixman zlib
-    ];
-
-  meta = {
-    description = "Adobe Flash Player standalone executable";
-    homepage = "https://www.adobe.com/support/flashplayer/debug_downloads.html";
-    license = lib.licenses.unfree;
-    maintainers = with lib.maintainers; [ taku0 ];
-    platforms = [ "x86_64-linux" ];
-    # Application crashed with an unhandled SIGSEGV
-    # Not on all systems, though. Video driver problem?
-    broken = false;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 27c2b48e66b..f0d8ceb9e20 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -178,6 +178,9 @@ mapAliases ({
   firestr = throw "firestr has been removed."; # added 2019-12-08
   fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # added 2020-12-29, modified 2021-01-10
   flameGraph = flamegraph; # added 2018-04-25
+  flashplayer = throw "flashplayer has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07
+  flashplayer-standalone = throw "flashplayer-standalone has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07
+  flashplayer-standalone-debugger = throw "flashplayer-standalone-debugger has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07
   flink_1_5 = throw "flink_1_5 was removed, use flink instead"; # added 2021-01-25
   flutter-beta = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # added 2020-01-15
   flutter-dev = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # added 2020-01-15
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cc5c9fff481..c31d99398f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22243,14 +22243,6 @@ in
 
   flameshot = libsForQt5.callPackage ../tools/misc/flameshot { };
 
-  flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer (config.flashplayer or {});
-
-  flashplayer-standalone = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix (config.flashplayer or {});
-
-  flashplayer-standalone-debugger = flashplayer-standalone.override {
-    debug = true;
-  };
-
   fluxbox = callPackage ../applications/window-managers/fluxbox { };
 
   fme = callPackage ../applications/misc/fme {
-- 
cgit 1.4.1