From 551ef1ac41bd14b43f97ec5226cac4f13432df52 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Tue, 11 Sep 2018 10:12:06 +0200 Subject: [PATCH] firefox: provide clang configure flags on i686 With the upgrade to firefox 62 clang flags are now required on i686. (cherry picked from commit acf4a4eff315a52d8f9c944a167ecb373bc1fdf9) --- pkgs/applications/networking/browsers/firefox/common.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 16c9b548325e..f900b1b69cfd 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -196,8 +196,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional (stdenv.isDarwin && lib.versionAtLeast ffversion "61") "--disable-xcode-checks" ++ lib.optional (lib.versionOlder ffversion "61") "--enable-system-hunspell" - ++ lib.optionals (lib.versionAtLeast ffversion "56" && !stdenv.hostPlatform.isi686) [ - # on i686-linux: --with-libclang-path is not available in this configuration + ++ lib.optionals (lib.versionAtLeast ffversion "56") [ "--with-libclang-path=${llvmPackages.libclang}/lib" "--with-clang-path=${llvmPackages.clang}/bin/clang" ]