From 320f963e160926f8b42fd15c8826acb11d9382a1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 27 Aug 2015 11:17:08 +0200 Subject: [PATCH] firefox: Build with internal cairo This might fix the recent segfaults, according to https://bugzilla.redhat.com/show_bug.cgi?id=1253086. Fixes #9368. --- pkgs/applications/networking/browsers/firefox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 326f39515fc4..2c433d12db55 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { alsaLib nspr nss libnotify xlibs.pixman yasm mesa xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper - hunspell libevent libstartup_notification libvpx cairo + hunspell libevent libstartup_notification libvpx /* cairo */ gstreamer gst_plugins_base icu libpng jemalloc libpulseaudio # only headers are needed ] @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { "--enable-system-hunspell" "--enable-system-pixman" "--enable-system-sqlite" - "--enable-system-cairo" + #"--enable-system-cairo" "--enable-gstreamer" "--enable-startup-notification" "--enable-content-sandbox" # available since 26.0, but not much info available