about summary refs log tree commit diff
path: root/pkgs/applications/networking/browsers/firefox
diff options
context:
space:
mode:
authorPiotr Bogdan <ppbogdan@gmail.com>2017-12-18 00:03:24 +0000
committerPiotr Bogdan <ppbogdan@gmail.com>2017-12-21 20:41:27 +0000
commit3682eafc81ff7e687d6466efc9ba59ae6d22dd15 (patch)
tree8e5190bf57c3c88b9e6f5bc5689d9fd1bd2bba88 /pkgs/applications/networking/browsers/firefox
parent02166b0ecce4b8b1176cde0757df24fd8496f813 (diff)
Revert "firefox: fixup build on i686-linux after 56.x update"
Otherwise the configure phase fails on i686-linux.

This reverts commit e067d26f43c2b798db692e329afc074b79acf086.
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox')
-rw-r--r--pkgs/applications/networking/browsers/firefox/common.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index c035a17d03c32..919db15078874 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -126,8 +126,7 @@ stdenv.mkDerivation (rec {
     "--disable-gconf"
     "--enable-default-toolkit=cairo-gtk${if gtk3Support then "3" else "2"}"
   ]
-  ++ lib.optionals (stdenv.lib.versionAtLeast version "56" && !stdenv.hostPlatform.isi686) [
-    # on i686-linux: --with-libclang-path is not available in this configuration
+  ++ lib.optionals (stdenv.lib.versionAtLeast version "56") [
     "--with-libclang-path=${llvmPackages.clang-unwrapped}/lib"
     "--with-clang-path=${llvmPackages.clang}/bin/clang"
   ]