diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2018-08-21 15:32:39 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-21 15:32:39 +0200 |
| commit | cad8fc3447372043c4a098a3104a03f4990058e4 (patch) | |
| tree | e2589d46cb9e4cd09108fbc052fa386e9700a0d4 /pkgs | |
| parent | eccba564a47da62c99642e299458f409ba8b1859 (diff) | |
| download | nixpkgs-cad8fc3447372043c4a098a3104a03f4990058e4.tar nixpkgs-cad8fc3447372043c4a098a3104a03f4990058e4.tar.gz nixpkgs-cad8fc3447372043c4a098a3104a03f4990058e4.tar.bz2 nixpkgs-cad8fc3447372043c4a098a3104a03f4990058e4.tar.lz nixpkgs-cad8fc3447372043c4a098a3104a03f4990058e4.tar.xz nixpkgs-cad8fc3447372043c4a098a3104a03f4990058e4.tar.zst nixpkgs-cad8fc3447372043c4a098a3104a03f4990058e4.zip | |
firefoxPackages: avoid BINDGEN_CFLAGS on some versions
... to fix build; vcunat included the old ESR firefox, too.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 4 |
1 files 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 |