firefox: Update to 19.0.1

And use --with-system-nss again.
This commit is contained in:
Eelco Dolstra 2013-03-01 13:52:10 +01:00
parent a1c5d6642b
commit 56d197ab0b

View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
, freetype, fontconfig, file, alsaLib, nspr, libnotify
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
, # If you want the resulting program to call itself "Firefox" instead
@ -15,9 +15,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
rec {
firefoxVersion = "19.0";
firefoxVersion = "19.0.1";
xulVersion = "19.0"; # this attribute is used by other packages
xulVersion = "19.0.1"; # this attribute is used by other packages
src = fetchurl {
@ -27,7 +27,7 @@ rec {
# Fall back to this url for versions not available at releases.mozilla.org.
"ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
];
sha1 = "816d64e8c9432349cd208fd181d210c54f985351";
sha1 = "6a3a965c165ceda8c5ba038e9fe0136fbd1690ff";
};
commonConfigureFlags =
@ -39,9 +39,9 @@ rec {
"--with-system-zlib"
"--with-system-bz2"
"--with-system-nspr"
# "--with-system-nss" # Too old in nixpkgs
"--with-system-nss"
# "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
# "--enable-system-cairo" # disabled for the moment because our Cairo is too old
# "--enable-system-cairo" # <-- doesn't build
"--enable-system-sqlite"
"--disable-crashreporter"
"--disable-tests"
@ -60,7 +60,7 @@ rec {
[ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
python dbus dbus_glib pango freetype fontconfig xlibs.libXi
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
alsaLib nspr libnotify xlibs.pixman yasm mesa
alsaLib nspr nss libnotify xlibs.pixman yasm mesa
xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
];
@ -125,7 +125,7 @@ rec {
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
xlibs.pixman yasm mesa sqlite file unzip pysqlite
];