Author: eelco
Date: Mon Jul 4 15:35:53 2011
New Revision: 27602
URL: https://svn.nixos.org/websvn/nix/?rev=27602&sc=1
Log:
* Firefox: use external SQLite and Cairo.
Modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/5.0.nix
Modified: nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/5.0.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/5.0.nix Mon Jul
4 15:05:12 2011 (r27601)
+++ nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/5.0.nix Mon Jul
4 15:35:53 2011 (r27602)
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
-, yasm, mesa
+, yasm, mesa, sqlite
, # If you want the resulting program to call itself "Firefox" instead
# of "Shiretoko" or whatever, enable this option. However, those
@@ -36,11 +36,8 @@
"--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"
- # Disabled system Cairo for now because it causes gradients in tabs etc.
to be missing.
- # "--enable-system-cairo"
- # Compiling with the Nixpkgs SQLite gives:
- # "configure: error: System SQLite library is not compiled with
SQLITE_SECURE_DELETE."
- # "--enable-system-sqlite"
+ "--enable-system-cairo"
+ "--enable-system-sqlite"
"--disable-crashreporter"
"--disable-tests"
"--disable-necko-wifi" # maybe we want to enable this at some point
@@ -60,7 +57,7 @@
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
alsaLib nspr /* nss */ libnotify xlibs.pixman yasm mesa
xlibs.libXScrnSaver xlibs.scrnsaverproto
- xlibs.libXext xlibs.xextproto
+ xlibs.libXext xlibs.xextproto sqlite
];
configureFlags =
@@ -128,7 +125,7 @@
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
- xlibs.pixman yasm mesa
+ xlibs.pixman yasm mesa sqlite
];
propagatedBuildInputs = [xulrunner];
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
