From f59881fc30d3e72d72f6f2e9e3688226bea0d2e9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 14 Jan 2013 13:10:16 +0100
Subject: [PATCH] mplayer: Change directory name / attribute name from MPlayer
 to mplayer

---
 .../browsers/mozilla-plugins/gecko-mediaplayer/default.nix    | 4 ++--
 pkgs/applications/video/{MPlayer => mplayer}/default.nix      | 0
 pkgs/top-level/all-packages.nix                               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename pkgs/applications/video/{MPlayer => mplayer}/default.nix (100%)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix
index 0ff7c92d3d89..44f191e54f1d 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, browser, x11
-, GConf, gnome_mplayer, MPlayer, gmtk
+, GConf, gnome_mplayer, mplayer, gmtk
 }:
 
 stdenv.mkDerivation rec {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   # browser's $PATH.
   postInstall =
     ''
-      echo "${gnome_mplayer}/bin:${MPlayer}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path
+      echo "${gnome_mplayer}/bin:${mplayer}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path
     '';
 
   passthru.mozillaPlugin = "/lib/mozilla/plugins";
diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/mplayer/default.nix
similarity index 100%
rename from pkgs/applications/video/MPlayer/default.nix
rename to pkgs/applications/video/mplayer/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1618dd7e7094..f5b7409a0155 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7543,7 +7543,7 @@ let
 
   ncmpcpp = callPackage ../applications/audio/ncmpcpp { };
 
-  MPlayer = callPackage ../applications/video/MPlayer {
+  mplayer = callPackage ../applications/video/mplayer {
     pulseSupport = config.pulseaudio or false;
   };