Skip to content

Commit

Permalink
firefox: fixup build on i686-linux after 56.x update
Browse files Browse the repository at this point in the history
Broken since #30143.
I can't say I understand why this combination is apparently unsupported.
i686-linux is a second-tier platform now, but firefox is still kept a
channel blocker...

(cherry picked from commit e067d26)
  • Loading branch information
vcunat committed Oct 14, 2017
1 parent 7cc0a7a commit cdf6ee3
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion pkgs/applications/networking/browsers/firefox/common.nix
Expand Up @@ -128,7 +128,8 @@ stdenv.mkDerivation (rec {
"--disable-gconf"
"--enable-default-toolkit=cairo-gtk${if gtk3Support then "3" else "2"}"
]
++ lib.optionals (stdenv.lib.versionAtLeast version "56") [
++ lib.optionals (stdenv.lib.versionAtLeast version "56" && !stdenv.hostPlatform.isi686) [
# on i686-linux: --with-libclang-path is not available in this configuration
"--with-libclang-path=${llvmPackages.clang-unwrapped}/lib"
"--with-clang-path=${llvmPackages.clang}/bin/clang"
]
Expand Down

0 comments on commit cdf6ee3

Please sign in to comment.