mplayer: move to by-name (#527927)

pkgs/by-name/mp/mplayer/package.nix

@@ -8,63 +8,63 @@
   freetype,
   yasm,
   ffmpeg_7,
-  aalibSupport ? true,
+  aalibSupport ? config.mplayer.aalibSupport or true,
   aalib,
-  fontconfigSupport ? true,
+  fontconfigSupport ? config.mplayer.fontconfigSupport or true,
   fontconfig,
   freefont_ttf,
-  fribidiSupport ? true,
+  fribidiSupport ? config.mplayer.fribidiSupport or true,
   fribidi,
-  x11Support ? true,
+  x11Support ? config.mplayer.x11Support or true,
   libx11,
   libxext,
   libGLU,
   libGL,
-  xineramaSupport ? true,
+  xineramaSupport ? config.mplayer.xineramaSupport or true,
   libxinerama,
-  xvSupport ? true,
+  xvSupport ? config.mplayer.xvSupport or true,
   libxv,
-  alsaSupport ? stdenv.hostPlatform.isLinux,
+  alsaSupport ? !stdenv.hostPlatform.isDarwin,
   alsa-lib,
-  screenSaverSupport ? true,
+  screenSaverSupport ? config.mplayer.screenSaverSupport or true,
   libxscrnsaver,
-  vdpauSupport ? false,
+  vdpauSupport ? config.mplayer.vdpauSupport or false,
   libvdpau,
   cddaSupport ? !stdenv.hostPlatform.isDarwin,
   cdparanoia,
   dvdnavSupport ? !stdenv.hostPlatform.isDarwin,
-  libdvdnav,
-  dvdreadSupport ? true,
+  libdvdnav_4_2_1,
+  dvdreadSupport ? config.mplayer.dvdreadSupport or true,
   libdvdread,
-  bluraySupport ? true,
+  bluraySupport ? config.mplayer.bluraySupport or true,
   libbluray,
-  amrSupport ? false,
+  amrSupport ? config.mplayer.amrSupport or false,
   amrnb,
   amrwb,
-  cacaSupport ? true,
+  cacaSupport ? config.mplayer.cacaSupport or true,
   libcaca,
-  lameSupport ? true,
+  lameSupport ? config.mplayer.lameSupport or true,
   lame,
-  speexSupport ? true,
+  speexSupport ? config.mplayer.speexSupport or true,
   speex,
-  theoraSupport ? true,
+  theoraSupport ? config.mplayer.theoraSupport or true,
   libtheora,
-  x264Support ? false,
+  x264Support ? config.mplayer.x264Support or false,
   x264,
-  jackaudioSupport ? false,
+  jackaudioSupport ? config.mplayer.jackaudioSupport or false,
   libjack2,
   pulseSupport ? config.pulseaudio or false,
   libpulseaudio,
-  bs2bSupport ? false,
+  bs2bSupport ? config.mplayer.bs2bSupport or false,
   libbs2b,
-  v4lSupport ? false,
+  v4lSupport ? config.mplayer.v4lSupport or false,
   libv4l,
   # For screenshots
-  libpngSupport ? true,
+  libpngSupport ? config.mplayer.libpngSupport or true,
   libpng,
-  libjpegSupport ? true,
+  libjpegSupport ? config.mplayer.libjpegSupport or true,
   libjpeg,
-  useUnfreeCodecs ? false,
+  useUnfreeCodecs ? config.mplayer.useUnfreeCodecs or false,
   buildPackages,
   versionCheckHook,
 }:
@@ -161,7 +161,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optional theoraSupport libtheora
   ++ lib.optional cacaSupport libcaca
   ++ lib.optional xineramaSupport libxinerama
-  ++ lib.optional dvdnavSupport libdvdnav
+  ++ lib.optional dvdnavSupport libdvdnav_4_2_1
   ++ lib.optional dvdreadSupport libdvdread
   ++ lib.optional bluraySupport libbluray
   ++ lib.optional cddaSupport cdparanoia

pkgs/top-level/all-packages.nix

@@ -9086,13 +9086,6 @@ with pkgs;
     withConplay = false;
   };
 
-  mplayer = callPackage ../applications/video/mplayer (
-    {
-      libdvdnav = libdvdnav_4_2_1;
-    }
-    // (config.mplayer or { })
-  );
-
   mpvScripts = callPackage ../by-name/mp/mpv/scripts.nix { };
 
   murmur =