* Firefox 4: add --enable-chrome-format=jar to make it run.
svn path=/nixpkgs/trunk/; revision=26459
This commit is contained in:
parent
769c522df6
commit
73a66cc5e1
1 changed files with 6 additions and 1 deletions
|
@ -60,9 +60,11 @@ rec {
|
||||||
"--disable-javaxpcom"
|
"--disable-javaxpcom"
|
||||||
] ++ commonConfigureFlags;
|
] ++ commonConfigureFlags;
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
# !!! Temporary hack.
|
# !!! Temporary hack.
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
export NIX_ENFORCE_PURITY=
|
export NIX_ENFORCE_PURITY=
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# Hack to work around make's idea of -lbz2 dependency
|
# Hack to work around make's idea of -lbz2 dependency
|
||||||
|
@ -111,6 +113,8 @@ rec {
|
||||||
|
|
||||||
inherit src;
|
inherit src;
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
|
[ 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 libnotify
|
||||||
|
@ -122,6 +126,7 @@ rec {
|
||||||
configureFlags =
|
configureFlags =
|
||||||
[ "--enable-application=browser"
|
[ "--enable-application=browser"
|
||||||
"--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
|
"--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
|
||||||
|
"--enable-chrome-format=jar"
|
||||||
]
|
]
|
||||||
++ commonConfigureFlags
|
++ commonConfigureFlags
|
||||||
++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
|
++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
|
||||||
|
|
Loading…
Reference in a new issue