Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 747500e0cf91
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dab31f2a9e6e
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Sep 11, 2018

  1. firefox: provide clang configure flags on i686 

    With the upgrade to firefox 62 clang flags are now required on i686.
    @andir
    andir committed Sep 11, 2018
    Copy the full SHA
    acf4a4e View commit details

  2. Merge pull request #46511 from andir/18.03/firefox-i686 

    [18.03] firefox: provide clang configure flags on i686
    @andir
    andir authored Sep 11, 2018
    Copy the full SHA
    dab31f2 View commit details
Showing with 1 addition and 2 deletions.
  1. +1 −2 pkgs/applications/networking/browsers/firefox/common.nix
3 changes: 1 addition & 2 deletions pkgs/applications/networking/browsers/firefox/common.nix
View file
Original file line number Diff line number Diff line change
@@ -152,8 +152,7 @@ stdenv.mkDerivation (rec {
"--enable-default-toolkit=cairo-gtk${if gtk3Support then "3" else "2"}"
]
++ lib.optional (lib.versionOlder version "61") "--enable-system-hunspell"
++ lib.optionals (lib.versionAtLeast version "56" && !stdenv.hostPlatform.isi686) [
# on i686-linux: --with-libclang-path is not available in this configuration
++ lib.optionals (lib.versionAtLeast version "56") [
"--with-libclang-path=${llvmPackages.libclang}/lib"
"--with-clang-path=${llvmPackages.clang}/bin/clang"
]