diff options
| author | Andreas Rammhold <andreas@rammhold.de> | 2018-12-11 10:37:55 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2018-12-18 01:28:07 +0100 |
| commit | 1dbf649c91895740fa236f578335c46624f32359 (patch) | |
| tree | 5bc8914203b85867a8b2386f802c1718b85170f3 | |
| parent | nixos/mysql: support package=mysql57 (diff) | |
| download | nixpkgs-1dbf649c91895740fa236f578335c46624f32359.tar.gz | |
firefox: updated common.nix to support ffx64
See #51863.
(cherry picked from commit 783dc61f68666118cbf6e9cc5a52abe73cb783a3)
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 3e9e287b95b2..db44db4acbf0 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -170,6 +170,10 @@ stdenv.mkDerivation (rec { configureFlagsArray+=("--with-google-api-keyfile=$TMPDIR/ga") '' + lib.optionalString (lib.versionOlder version "58") '' cd obj-* + '' + # AS=as in the environment causes build failure https://bugzilla.mozilla.org/show_bug.cgi?id=1497286 + + lib.optionalString (lib.versionAtLeast version "64") '' + unset AS ''; configureFlags = [ @@ -191,10 +195,10 @@ stdenv.mkDerivation (rec { "--disable-necko-wifi" # maybe we want to enable this at some point "--disable-updater" "--enable-jemalloc" - "--disable-maintenance-service" "--disable-gconf" "--enable-default-toolkit=${default-toolkit}" ] + ++ lib.optional (lib.versionOlder version "64") "--disable-maintenance-service" ++ lib.optional (stdenv.isDarwin && lib.versionAtLeast version "61") "--disable-xcode-checks" ++ lib.optional (lib.versionOlder version "61") "--enable-system-hunspell" ++ lib.optionals (lib.versionAtLeast version "56") [ |