diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-14 13:10:16 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-14 14:38:24 +0100 |
| commit | f59881fc30d3e72d72f6f2e9e3688226bea0d2e9 (patch) | |
| tree | e321ba9ea2c6d7f6963be1a93d507d843514fe09 /pkgs | |
| parent | 58e9406f4b834468dbf320754edf12994affc27c (diff) | |
| download | nixpkgs-f59881fc30d3e72d72f6f2e9e3688226bea0d2e9.tar nixpkgs-f59881fc30d3e72d72f6f2e9e3688226bea0d2e9.tar.gz nixpkgs-f59881fc30d3e72d72f6f2e9e3688226bea0d2e9.tar.bz2 nixpkgs-f59881fc30d3e72d72f6f2e9e3688226bea0d2e9.tar.lz nixpkgs-f59881fc30d3e72d72f6f2e9e3688226bea0d2e9.tar.xz nixpkgs-f59881fc30d3e72d72f6f2e9e3688226bea0d2e9.tar.zst nixpkgs-f59881fc30d3e72d72f6f2e9e3688226bea0d2e9.zip | |
mplayer: Change directory name / attribute name from MPlayer to mplayer
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/video/mplayer/default.nix (renamed from pkgs/applications/video/MPlayer/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 3 insertions, 3 deletions
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 0ff7c92d3d8..44f191e54f1 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 index 944af1c2657..944af1c2657 100644 --- a/pkgs/applications/video/MPlayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1618dd7e709..f5b7409a015 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; }; |