From cad8fc3447372043c4a098a3104a03f4990058e4 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 21 Aug 2018 15:32:39 +0200 Subject: [PATCH] firefoxPackages: avoid BINDGEN_CFLAGS on some versions ... to fix build; vcunat included the old ESR firefox, too. --- pkgs/applications/networking/browsers/firefox/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index e2a3d4430df..b8a5faddc34 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -135,7 +135,7 @@ stdenv.mkDerivation (rec { '' else '' make -f client.mk configure-files configureScript="$(realpath ./configure)" - '') + '' + '') + lib.optionalString (!isTorBrowserLike && lib.versionAtLeast version "53") '' export MOZCONFIG=$(pwd)/mozconfig # Set C flags for Rust's bindgen program. Unlike ordinary C @@ -184,8 +184,8 @@ stdenv.mkDerivation (rec { "--disable-maintenance-service" "--disable-gconf" "--enable-default-toolkit=${default-toolkit}" - "--disable-xcode-checks" ] + ++ lib.optional stdenv.isDarwin "--disable-xcode-checks" ++ 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