diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-07-04 12:25:35 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-07-04 12:25:35 +0000 |
commit | b8558fd04f0aa673c5ff432c3f37158940280a9e (patch) | |
tree | 4e65899ebdb7c33bf6a47b5f9f9bde4b4ca0e170 /pkgs/applications/networking | |
parent | fd7a6cd6b5db04a8499c0489fbf4c95762fbbf1a (diff) | |
download | nixlib-b8558fd04f0aa673c5ff432c3f37158940280a9e.tar nixlib-b8558fd04f0aa673c5ff432c3f37158940280a9e.tar.gz nixlib-b8558fd04f0aa673c5ff432c3f37158940280a9e.tar.bz2 nixlib-b8558fd04f0aa673c5ff432c3f37158940280a9e.tar.lz nixlib-b8558fd04f0aa673c5ff432c3f37158940280a9e.tar.xz nixlib-b8558fd04f0aa673c5ff432c3f37158940280a9e.tar.zst nixlib-b8558fd04f0aa673c5ff432c3f37158940280a9e.zip |
* Added NSPR, the Netscape Portable Runtime, and use it in Xulrunner
and Firefox. * Xulrunner: don't install the tests. This saves a few megabytes. svn path=/nixpkgs/trunk/; revision=16173
Diffstat (limited to 'pkgs/applications/networking')
-rw-r--r-- | pkgs/applications/networking/browsers/firefox/3.5.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/3.5.nix b/pkgs/applications/networking/browsers/firefox/3.5.nix index 6e544e47ca91..e223021f3e24 100644 --- a/pkgs/applications/networking/browsers/firefox/3.5.nix +++ b/pkgs/applications/networking/browsers/firefox/3.5.nix @@ -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 +, freetype, fontconfig, file, alsaLib, nspr , # If you want the resulting program to call itself "Firefox" instead # of "Deer Park", enable this option. However, those binaries may @@ -29,10 +29,12 @@ rec { "--with-system-jpeg" "--with-system-zlib" "--with-system-bz2" + "--with-system-nspr" # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" "--enable-system-cairo" #"--enable-system-sqlite" # <-- this seems to be discouraged "--disable-crashreporter" + "--disable-tests" ]; @@ -45,7 +47,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 + alsaLib nspr ]; configureFlags = @@ -63,8 +65,6 @@ rec { postInstall = '' export dontPatchELF=1 - make -C nsprpub install - # Fix some references to /bin paths in the Xulrunner shell script. substituteInPlace $out/bin/xulrunner \ --replace /bin/pwd "$(type -tP pwd)" \ @@ -102,7 +102,7 @@ rec { buildInputs = [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python - dbus dbus_glib pango freetype fontconfig alsaLib + dbus dbus_glib pango freetype fontconfig alsaLib nspr ]; propagatedBuildInputs = [xulrunner]; @@ -110,7 +110,6 @@ rec { configureFlags = [ "--enable-application=browser" "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}" - "--with-system-nspr" ] ++ commonConfigureFlags ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; |