diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 9f2566d07d6d..f5bc0c902854 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -9,7 +9,7 @@ , yasm, libGLU, libGL, sqlite, unzip, makeWrapper , hunspell, libevent, libstartup_notification , libvpx_1_8 -, icu69, libpng, jemalloc, glib, pciutils +, icu69, libpng, glib, pciutils , autoconf213, which, gnused, rustPackages, rustPackages_1_45 , rust-cbindgen, nodejs, nasm, fetchpatch , gnum4 @@ -27,6 +27,7 @@ , ltoSupport ? (stdenv.isLinux && stdenv.is64bit), overrideCC, buildPackages , gssSupport ? true, libkrb5 , pipewireSupport ? waylandSupport && webrtcSupport, pipewire +, jemallocSupport ? true, jemalloc ## privacy-related options @@ -189,7 +190,7 @@ buildStdenv.mkDerivation ({ xorg.libXdamage xorg.libXext libevent libstartup_notification /* cairo */ - libpng jemalloc glib + libpng glib nasm icu69 libvpx_1_8 # >= 66 requires nasm for the AV1 lib dav1d # yasm can potentially be removed in future versions @@ -202,6 +203,7 @@ buildStdenv.mkDerivation ({ ++ lib.optional gssSupport libkrb5 ++ lib.optionals waylandSupport [ libxkbcommon libdrm ] ++ lib.optional pipewireSupport pipewire + ++ lib.optional jemallocSupport jemalloc ++ lib.optional (lib.versionAtLeast version "82") gnum4 ++ lib.optionals buildStdenv.isDarwin [ CoreMedia ExceptionHandling Kerberos AVFoundation MediaToolbox CoreLocation @@ -309,7 +311,6 @@ buildStdenv.mkDerivation ({ "--disable-tests" "--disable-necko-wifi" # maybe we want to enable this at some point "--disable-updater" - "--enable-jemalloc" "--enable-default-toolkit=${default-toolkit}" "--with-libclang-path=${llvmPackages.libclang.lib}/lib" "--with-system-nspr" @@ -329,6 +330,7 @@ buildStdenv.mkDerivation ({ ++ flag alsaSupport "alsa" ++ flag pulseaudioSupport "pulseaudio" ++ flag ffmpegSupport "ffmpeg" + ++ flag jemallocSupport "jemalloc" ++ flag gssSupport "negotiateauth" ++ flag webrtcSupport "webrtc" ++ flag crashreporterSupport "crashreporter"