diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-10-14 21:23:16 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-10-14 21:24:15 +0200 |
| commit | e067d26f43c2b798db692e329afc074b79acf086 (patch) | |
| tree | dfbd336ee00a5dc6d5181cbac5c5d121c9a780b7 /pkgs/applications/networking/browsers/firefox/common.nix | |
| parent | 0f01f8b882627b063f00722a2a8985fcfe6a82cf (diff) | |
| download | nixpkgs-e067d26f43c2b798db692e329afc074b79acf086.tar nixpkgs-e067d26f43c2b798db692e329afc074b79acf086.tar.gz nixpkgs-e067d26f43c2b798db692e329afc074b79acf086.tar.bz2 nixpkgs-e067d26f43c2b798db692e329afc074b79acf086.tar.lz nixpkgs-e067d26f43c2b798db692e329afc074b79acf086.tar.xz nixpkgs-e067d26f43c2b798db692e329afc074b79acf086.tar.zst nixpkgs-e067d26f43c2b798db692e329afc074b79acf086.zip | |
firefox: fixup build on i686-linux after 56.x update
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...
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox/common.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index cc7927fdc54..b8f57eb2edb 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -130,7 +130,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" ] |