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...
  • Loading branch information
@vcunat
vcunat committed Oct 14, 2017
1 parent 0f01f8b commit e067d26
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion pkgs/applications/networking/browsers/firefox/common.nix
View file
Expand Up @@ -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"
]
Expand Down

3 comments on commit e067d26

@fpletz
Copy link
Member

@fpletz fpletz commented on e067d26 Oct 14, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! I'm going to remove all tests on systems with limited support from the tested job.

@vcunat
Copy link
Member Author

@vcunat vcunat commented on e067d26 Oct 14, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right. It's probably better to leave them running but not blocking the channels.

@fpletz
Copy link
Member

@fpletz fpletz commented on e067d26 Oct 14, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done: 874a3c0

Please sign in to comment.