cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

firefox: fix system libffi usage

Browse source 
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
This commit is contained in:
Martin Weinelt 2022-03-21 18:16:55 +01:00
parent 08ea534e67
commit 51e5f33899
No known key found for this signature in database
GPG key ID: 87C1E9888F856759
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/networking/browsers/firefox/common.nix
View file

@ -16,6 +16,7 @@
, freetype, fontconfig, file, nspr, nss , freetype, fontconfig, file, nspr, nss
, libGLU, libGL, sqlite, unzip, makeWrapper , libGLU, libGL, sqlite, unzip, makeWrapper
, hunspell, libevent, libstartup_notification , hunspell, libevent, libstartup_notification
, libffi
, libvpx , libvpx
, libwebp , libwebp
, icu, libpng, glib, pciutils , icu, libpng, glib, pciutils
@ -157,6 +158,7 @@ buildStdenv.mkDerivation ({
libevent libstartup_notification libevent libstartup_notification
libpng glib libpng glib
nasm icu libvpx nasm icu libvpx
libffi
libwebp libwebp
nspr nss nspr nss
] ]
@ -224,13 +226,13 @@ buildStdenv.mkDerivation ({
configureFlags = [ configureFlags = [
"--enable-application=${application}" "--enable-application=${application}"
"--with-system-ffi"
"--with-system-jpeg" "--with-system-jpeg"
"--with-system-zlib" "--with-system-zlib"
"--with-system-libevent" "--with-system-libevent"
"--with-system-libvpx" "--with-system-libvpx"
"--with-system-png" # needs APNG support "--with-system-png" # needs APNG support
"--with-system-icu" "--with-system-icu"
"--enable-system-ffi"
"--enable-system-pixman" "--enable-system-pixman"
"--disable-tests" "--disable-tests"
"--disable-updater" "--disable-updater"