diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-03-21 18:16:55 +0100 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-03-23 17:03:41 +0100 |
| commit | 51e5f33899ce9d404051fd6404b0f28e5291d2cf (patch) | |
| tree | 7b403056afd8d570e1044fc6a01a6b9ca9a8a777 | |
| parent | 08ea534e674a0e29f96647e7759fae6dc9a668c2 (diff) | |
| download | nixpkgs-51e5f33899ce9d404051fd6404b0f28e5291d2cf.tar nixpkgs-51e5f33899ce9d404051fd6404b0f28e5291d2cf.tar.gz nixpkgs-51e5f33899ce9d404051fd6404b0f28e5291d2cf.tar.bz2 nixpkgs-51e5f33899ce9d404051fd6404b0f28e5291d2cf.tar.lz nixpkgs-51e5f33899ce9d404051fd6404b0f28e5291d2cf.tar.xz nixpkgs-51e5f33899ce9d404051fd6404b0f28e5291d2cf.tar.zst nixpkgs-51e5f33899ce9d404051fd6404b0f28e5291d2cf.zip | |
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
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 6b853d44a91..f8a2215ebe7 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" |