diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-10-17 13:56:56 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-10-17 13:56:56 +0000 |
| commit | 8b01d4ef0a5c43d93957ce639fac3f6af501c443 (patch) | |
| tree | 19810120623ca244e75ecf5335fa96ee3edc72e5 /pkgs/system/all-packages-generic.nix | |
| parent | c233d6f67c167b3a35dd7a63970e7d7342a2863b (diff) | |
| download | nixpkgs-8b01d4ef0a5c43d93957ce639fac3f6af501c443.tar nixpkgs-8b01d4ef0a5c43d93957ce639fac3f6af501c443.tar.gz nixpkgs-8b01d4ef0a5c43d93957ce639fac3f6af501c443.tar.bz2 nixpkgs-8b01d4ef0a5c43d93957ce639fac3f6af501c443.tar.lz nixpkgs-8b01d4ef0a5c43d93957ce639fac3f6af501c443.tar.xz nixpkgs-8b01d4ef0a5c43d93957ce639fac3f6af501c443.tar.zst nixpkgs-8b01d4ef0a5c43d93957ce639fac3f6af501c443.zip | |
* Added the Flash Player plugin.
* Plugins can specify extra directories to be added to LD_LIBRARY_PATH by the Firefox wrapper. The Flash plugin need this since it's installed from a binary distribution, and so doesn't set the RPATH properly. * Moved the MPlayer plugin to a plugins directory. svn path=/nixpkgs/trunk/; revision=1566
Diffstat (limited to 'pkgs/system/all-packages-generic.nix')
| -rw-r--r-- | pkgs/system/all-packages-generic.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 649c4b4f2f8..b1ab2224c1f 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -798,7 +798,12 @@ rec { firefoxWrapper = (import ../applications/networking/browsers/firefox-wrapper) { inherit stdenv firefox; - plugins = [MPlayerPlugin]; + plugins = [MPlayerPlugin flashplayer]; + }; + + flashplayer = (import ../applications/networking/browsers/mozilla-plugins/flashplayer) { + inherit fetchurl stdenv zlib; + inherit (xlibs) libXmu; }; thunderbird = @@ -824,7 +829,7 @@ rec { alsa = alsaLib; }; - MPlayerPlugin = (import ../applications/video/mplayerplug-in) { + MPlayerPlugin = (import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in) { inherit fetchurl stdenv pkgconfig firefox; inherit (xlibs) libXpm; }; |