* Add Firefox 1.5beta2 to the channel.
svn path=/nixpkgs/trunk/; revision=4076
This commit is contained in:
parent
8148284d9c
commit
14b6982164
|
@ -1429,14 +1429,14 @@ rec {
|
||||||
inherit (xlibs) libXi;
|
inherit (xlibs) libXi;
|
||||||
};
|
};
|
||||||
|
|
||||||
firefoxbeta = (import ../applications/networking/browsers/firefox-1.5beta) {
|
firefoxBeta = (import ../applications/networking/browsers/firefox-1.5beta) {
|
||||||
inherit fetchurl stdenv pkgconfig perl zip;
|
inherit fetchurl stdenv pkgconfig perl zip;
|
||||||
inherit (gtkLibs) gtk;
|
inherit (gtkLibs) gtk;
|
||||||
inherit (gnome) libIDL;
|
inherit (gnome) libIDL;
|
||||||
inherit (xlibs) libXi;
|
inherit (xlibs) libXi;
|
||||||
};
|
};
|
||||||
|
|
||||||
firefoxWrapper = (import ../applications/networking/browsers/firefox-wrapper) {
|
wrapFirefox = firefox: (import ../applications/networking/browsers/firefox-wrapper) {
|
||||||
inherit stdenv firefox;
|
inherit stdenv firefox;
|
||||||
plugins = [
|
plugins = [
|
||||||
MPlayerPlugin
|
MPlayerPlugin
|
||||||
|
@ -1446,6 +1446,10 @@ rec {
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
firefoxWrapper = wrapFirefox firefox;
|
||||||
|
|
||||||
|
firefoxBetaWrapper = wrapFirefox firefoxBeta;
|
||||||
|
|
||||||
flashplayer = (import ../applications/networking/browsers/mozilla-plugins/flashplayer) {
|
flashplayer = (import ../applications/networking/browsers/mozilla-plugins/flashplayer) {
|
||||||
inherit fetchurl stdenv zlib;
|
inherit fetchurl stdenv zlib;
|
||||||
inherit (xlibs) libXmu;
|
inherit (xlibs) libXmu;
|
||||||
|
|
|
@ -67,6 +67,7 @@ let {
|
||||||
pan
|
pan
|
||||||
sylpheed
|
sylpheed
|
||||||
firefoxWrapper
|
firefoxWrapper
|
||||||
|
firefoxBetaWrapper
|
||||||
thunderbird
|
thunderbird
|
||||||
lynx
|
lynx
|
||||||
gaim
|
gaim
|
||||||
|
|
Loading…
Reference in New Issue