JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

firefox: provide clang configure flags on i686

Browse Source 
With the upgrade to firefox 62 clang flags are now required on i686.

(cherry picked from commit acf4a4eff315a52d8f9c944a167ecb373bc1fdf9)
This commit is contained in:
Andreas Rammhold 2018-09-11 10:12:06 +02:00
parent c8d45086d1
commit 551ef1ac41
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/networking/browsers/firefox/common.nix
View File

@ -196,8 +196,7 @@ stdenv.mkDerivation rec {
] ]
++ lib.optional (stdenv.isDarwin && lib.versionAtLeast ffversion "61") "--disable-xcode-checks" ++ lib.optional (stdenv.isDarwin && lib.versionAtLeast ffversion "61") "--disable-xcode-checks"
++ lib.optional (lib.versionOlder ffversion "61") "--enable-system-hunspell" ++ lib.optional (lib.versionOlder ffversion "61") "--enable-system-hunspell"
++ lib.optionals (lib.versionAtLeast ffversion "56" && !stdenv.hostPlatform.isi686) [ ++ lib.optionals (lib.versionAtLeast ffversion "56") [
# on i686-linux: --with-libclang-path is not available in this configuration
"--with-libclang-path=${llvmPackages.libclang}/lib" "--with-libclang-path=${llvmPackages.libclang}/lib"
"--with-clang-path=${llvmPackages.clang}/bin/clang" "--with-clang-path=${llvmPackages.clang}/bin/clang"
] ]