Author: eelco
Date: Tue Mar 22 14:14:50 2011
New Revision: 26459
URL: https://svn.nixos.org/websvn/nix/?rev=26459&sc=1
Log:
* Firefox 4: add --enable-chrome-format=jar to make it run.
Modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/4.0.nix
Modified: nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/4.0.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/4.0.nix Tue Mar
22 13:44:25 2011 (r26458)
+++ nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/4.0.nix Tue Mar
22 14:14:50 2011 (r26459)
@@ -60,9 +60,11 @@
"--disable-javaxpcom"
] ++ commonConfigureFlags;
+ enableParallelBuilding = true;
+
# !!! Temporary hack.
preBuild = ''
- export NIX_ENFORCE_PURITY=
+ export NIX_ENFORCE_PURITY=
'';
# Hack to work around make's idea of -lbz2 dependency
@@ -111,6 +113,8 @@
inherit src;
+ enableParallelBuilding = true;
+
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
@@ -122,6 +126,7 @@
configureFlags =
[ "--enable-application=browser"
"--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
+ "--enable-chrome-format=jar"
]
++ commonConfigureFlags
++ stdenv.lib.optional enableOfficialBranding
"--enable-official-branding";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
