diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-07-06 11:42:21 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-07-06 11:42:21 +0000 |
commit | 19963e0447d04f6398ed20a03390844703a9f7b5 (patch) | |
tree | 2fe18382a9ed1ead35bc4d4be87d6803a03b09f1 /pkgs/applications/networking/browsers/firefox | |
parent | 5b9d573d62dda490daf1400d940513386bef0d3b (diff) | |
download | nixlib-19963e0447d04f6398ed20a03390844703a9f7b5.tar nixlib-19963e0447d04f6398ed20a03390844703a9f7b5.tar.gz nixlib-19963e0447d04f6398ed20a03390844703a9f7b5.tar.bz2 nixlib-19963e0447d04f6398ed20a03390844703a9f7b5.tar.lz nixlib-19963e0447d04f6398ed20a03390844703a9f7b5.tar.xz nixlib-19963e0447d04f6398ed20a03390844703a9f7b5.tar.zst nixlib-19963e0447d04f6398ed20a03390844703a9f7b5.zip |
* Xulrunner/Firefox 3.5: build with --with-system-nss.
svn path=/nixpkgs/trunk/; revision=16186
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox')
-rw-r--r-- | pkgs/applications/networking/browsers/firefox/3.5.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/3.5.nix b/pkgs/applications/networking/browsers/firefox/3.5.nix index e223021f3e24..2d56240e1d74 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, nspr +, freetype, fontconfig, file, alsaLib, nspr, nss , # If you want the resulting program to call itself "Firefox" instead # of "Deer Park", enable this option. However, those binaries may @@ -30,6 +30,7 @@ rec { "--with-system-zlib" "--with-system-bz2" "--with-system-nspr" + "--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" #"--enable-system-sqlite" # <-- this seems to be discouraged @@ -47,7 +48,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 + alsaLib nspr nss ]; configureFlags = @@ -63,8 +64,6 @@ rec { installFlags = "SKIP_GRE_REGISTRATION=1"; postInstall = '' - export dontPatchELF=1 - # Fix some references to /bin paths in the Xulrunner shell script. substituteInPlace $out/bin/xulrunner \ --replace /bin/pwd "$(type -tP pwd)" \ @@ -83,7 +82,7 @@ rec { ln -s $i $out/bin fi; done; - rm $out/bin/run-mozilla.sh || true + rm -f $out/bin/run-mozilla.sh ''; # */ meta = { |