|
|
|
@ -9,7 +9,7 @@ |
|
|
|
|
, yasm, libGLU, libGL, sqlite, unzip, makeWrapper |
|
|
|
|
, hunspell, libevent, libstartup_notification |
|
|
|
|
, libvpx |
|
|
|
|
, icu69, libpng, glib, pciutils |
|
|
|
|
, icu70, libpng, glib, pciutils |
|
|
|
|
, autoconf213, which, gnused, rustPackages |
|
|
|
|
, rust-cbindgen, nodejs, nasm, fetchpatch |
|
|
|
|
, gnum4 |
|
|
|
@ -129,12 +129,14 @@ buildStdenv.mkDerivation ({ |
|
|
|
|
inherit src unpackPhase meta; |
|
|
|
|
|
|
|
|
|
patches = [ |
|
|
|
|
# Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1745560: |
|
|
|
|
./fix-build-with-wayland-1.20.patch |
|
|
|
|
] ++ |
|
|
|
|
lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch ++ |
|
|
|
|
lib.optional (lib.versionAtLeast version "90" && lib.versionOlder version "95") ./no-buildconfig-ffx90.patch ++ |
|
|
|
|
lib.optional (lib.versionAtLeast version "95") ./no-buildconfig-ffx95.patch ++ |
|
|
|
|
lib.optional (lib.versionAtLeast version "96") ./no-buildconfig-ffx96.patch ++ |
|
|
|
|
|
|
|
|
|
# Fix wayland 1.20 compatibility (https://bugzilla.mozilla.org/show_bug.cgi?id=1745560:) |
|
|
|
|
lib.optional (lib.versionOlder version "96") ./fix-build-with-wayland-1.20.patch ++ |
|
|
|
|
|
|
|
|
|
patches; |
|
|
|
|
|
|
|
|
|
# Ignore trivial whitespace changes in patches, this fixes compatibility of |
|
|
|
@ -150,9 +152,10 @@ buildStdenv.mkDerivation ({ |
|
|
|
|
xorg.xorgproto |
|
|
|
|
xorg.libXdamage |
|
|
|
|
xorg.libXext |
|
|
|
|
xorg.libXtst |
|
|
|
|
libevent libstartup_notification /* cairo */ |
|
|
|
|
libpng glib |
|
|
|
|
nasm icu69 libvpx |
|
|
|
|
nasm icu70 libvpx |
|
|
|
|
# >= 66 requires nasm for the AV1 lib dav1d |
|
|
|
|
# yasm can potentially be removed in future versions |
|
|
|
|
# https://bugzilla.mozilla.org/show_bug.cgi?id=1501796 |
|
|
|
|