@@ -7,8 +7,8 @@
77, freetype, fontconfig, file, nspr, nss, libnotify
88, yasm, libGLU, libGL, sqlite, unzip, makeWrapper
99, hunspell, libXdamage, libevent, libstartup_notification
10−, libvpx, libvpx_1_8
11−, icu, icu67, libpng, jemalloc, glib
10+, libvpx_1_8
11+, icu67, libpng, jemalloc, glib
1212, autoconf213, which, gnused, cargo, rustc, llvmPackages
1313, rust-cbindgen, nodejs, nasm, fetchpatch
1414, debugBuild ? false
@@ -112,17 +112,13 @@ stdenv.mkDerivation ({
112112 xorg.libXext unzip makeWrapper
113113 libevent libstartup_notification /* cairo */
114114 libpng jemalloc glib
115− nasm
115+ nasm icu67 libvpx_1_8
116116 # >= 66 requires nasm for the AV1 lib dav1d
117117 # yasm can potentially be removed in future versions
118118 # https://bugzilla.mozilla.org/show_bug.cgi?id=1501796
119119 # https://groups.google.com/forum/#!msg/mozilla.dev.platform/o-8levmLU80/SM_zQvfzCQAJ
120120 nspr nss
121121 ]
122− ++ lib.optionals (lib.versionOlder ffversion "75") [ libvpx sqlite ]
123− ++ lib.optional (lib.versionAtLeast ffversion "75.0") libvpx_1_8
124− ++ lib.optional (lib.versionOlder ffversion "78") icu
125− ++ lib.optional (lib.versionAtLeast ffversion "78.0") icu67
126122 ++ lib.optional alsaSupport alsaLib
127123 ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed
128124 ++ lib.optional gtk3Support gtk3
@@ -132,12 +128,10 @@ stdenv.mkDerivation ({
132128 AVFoundation MediaToolbox CoreLocation
133129 Foundation libobjc AddressBook cups ];
134130
135− NIX_CFLAGS_COMPILE = toString ([
131+ NIX_CFLAGS_COMPILE = toString [
136132 "-I${glib.dev}/include/gio-unix-2.0"
137133 "-I${nss.dev}/include/nss"
138− ]
139− ++ lib.optional (pname == "firefox-esr" && lib.versionOlder ffversion "69")
140− "-Wno-error=format-security");
134+ ];
141135
142136 postPatch = ''
143137 rm -rf obj-x86_64-pc-linux-gnu
@@ -228,16 +222,7 @@ stdenv.mkDerivation ({
228222 "--with-system-nspr"
229223 "--with-system-nss"
230224 ]
231− ++ lib.optionals (lib.versionOlder ffversion "78") [
232− "--with-system-bz2"
233− "--enable-startup-notification"
234− "--disable-gconf"
235− ]
236− ++ lib.optional (lib.versionOlder ffversion "75") "--enable-system-sqlite"
237225 ++ lib.optional (stdenv.isDarwin) "--disable-xcode-checks"
238− ++ lib.optionals (lib.versionOlder ffversion "69") [
239− "--enable-webrender=build"
240− ]
241226
242227 ++ flag alsaSupport "alsa"
243228 ++ flag pulseaudioSupport "pulseaudio"
@@ -305,16 +290,13 @@ stdenv.mkDerivation ({
305290 inherit execdir;
306291 inherit browserName;
307292 } // lib.optionalAttrs gtk3Support { inherit gtk3; };
308−} //
309−lib.optionalAttrs (lib.versionAtLeast ffversion "74") {
293+
310294 hardeningDisable = [ "format" ]; # -Werror=format-security
311−} //
312−# the build system verifies checksums of the bundled rust sources
313−# ./third_party/rust is be patched by our libtool fixup code in stdenv
314−# unfortunately we can't just set this to `false` when we do not want it.
315−# See https://github.com/NixOS/nixpkgs/issues/77289 for more details
316295
317−lib.optionalAttrs (lib.versionAtLeast ffversion "72") {
296+ # the build system verifies checksums of the bundled rust sources
297+ # ./third_party/rust is be patched by our libtool fixup code in stdenv
298+ # unfortunately we can't just set this to `false` when we do not want it.
299+ # See https://github.com/NixOS/nixpkgs/issues/77289 for more details
318300 # Ideally we would figure out how to tell the build system to not
319301 # care about changed hashes as we are already doing that when we
320302 # fetch the sources. Any further modifications of the source tree