public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

firefox: use system cairo now upstream properly supports it

Browse Source
This commit is contained in:
Mathijs Kwik 2013-09-17 22:47:45 +02:00
parent 36b503e06a
commit a918a0b366
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/networking/browsers/firefox/default.nix
View File

@ -3,8 +3,7 @@
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
, hunspell, libevent, libstartup_notification, libvpx , hunspell, libevent, libstartup_notification, libvpx
, cairo ? null , cairo
, useSystemCairo ? false
, # If you want the resulting program to call itself "Firefox" instead , # If you want the resulting program to call itself "Firefox" instead
# of "Shiretoko" or whatever, enable this option. However, those # of "Shiretoko" or whatever, enable this option. However, those
# binaries may not be distributed without permission from the # binaries may not be distributed without permission from the
@ -14,7 +13,6 @@
}: }:
assert stdenv.gcc ? libc && stdenv.gcc.libc != null; assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
assert useSystemCairo -> cairo != null;
let optional = stdenv.lib.optional; let optional = stdenv.lib.optional;
in rec { in rec {
@ -52,13 +50,14 @@ in rec {
"--enable-system-hunspell" "--enable-system-hunspell"
"--enable-system-pixman" "--enable-system-pixman"
"--enable-system-sqlite" "--enable-system-sqlite"
"--enable-system-cairo"
"--disable-crashreporter" "--disable-crashreporter"
"--disable-tests" "--disable-tests"
"--disable-necko-wifi" # maybe we want to enable this at some point "--disable-necko-wifi" # maybe we want to enable this at some point
"--disable-installer" "--disable-installer"
"--disable-updater" "--disable-updater"
"--disable-gstreamer" "--disable-gstreamer"
] ++ optional useSystemCairo "--enable-system-cairo"; ];
xulrunner = stdenv.mkDerivation rec { xulrunner = stdenv.mkDerivation rec {
@ -73,8 +72,8 @@ in rec {
alsaLib nspr nss libnotify xlibs.pixman yasm mesa alsaLib nspr nss libnotify xlibs.pixman yasm mesa
xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
hunspell libevent libstartup_notification libvpx hunspell libevent libstartup_notification libvpx cairo
] ++ optional useSystemCairo cairo; ];
configureFlags = configureFlags =
[ "--enable-application=xulrunner" [ "--enable-application=xulrunner"
@ -138,8 +137,8 @@ in rec {
[ pkgconfig libpng gtk perl zip libIDL libjpeg zlib bzip2 python [ pkgconfig libpng gtk perl zip libIDL libjpeg zlib bzip2 python
dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
xlibs.pixman yasm mesa sqlite file unzip pysqlite xlibs.pixman yasm mesa sqlite file unzip pysqlite
hunspell libevent libstartup_notification libvpx hunspell libevent libstartup_notification libvpx cairo
] ++ optional useSystemCairo cairo; ];
patches = [ patches = [
./disable-reporter.patch # fixes "search box not working when built on xulrunner" ./disable-reporter.patch # fixes "search box not working when built on xulrunner"