From 51e5f33899ce9d404051fd6404b0f28e5291d2cf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 21 Mar 2022 18:16:55 +0100
Subject: [PATCH] firefox: fix system libffi usage

Since Firefox 51 the --enable-system-ffi flag was renamed to
--with-systemd-ffi when it moved to the javascript toolkit parts. Rename
the flag accordingly and reintroduce the dependency.

mozbz#1294803
---
 pkgs/applications/networking/browsers/firefox/common.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 6b853d44a918..f8a2215ebe78 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -16,6 +16,7 @@
 , freetype, fontconfig, file, nspr, nss
 , libGLU, libGL, sqlite, unzip, makeWrapper
 , hunspell, libevent, libstartup_notification
+, libffi
 , libvpx
 , libwebp
 , icu, libpng, glib, pciutils
@@ -157,6 +158,7 @@ buildStdenv.mkDerivation ({
     libevent libstartup_notification
     libpng glib
     nasm icu libvpx
+    libffi
     libwebp
     nspr nss
   ]
@@ -224,13 +226,13 @@ buildStdenv.mkDerivation ({
 
   configureFlags = [
     "--enable-application=${application}"
+    "--with-system-ffi"
     "--with-system-jpeg"
     "--with-system-zlib"
     "--with-system-libevent"
     "--with-system-libvpx"
     "--with-system-png" # needs APNG support
     "--with-system-icu"
-    "--enable-system-ffi"
     "--enable-system-pixman"
     "--disable-tests"
     "--disable-updater"