git.iko.soy/typeable/nixpkgs
on master help sign in
firefox: support building firefox 66 (and 60.6+)
commitd64d42f12d253d4b0fde2b63e14d1f7d322b754c authorAndreas Rammhold <andreas@rammhold.de> dateFri 1 Mar 2019, 09:22 (8 years ago) parentb6fff67
2 files changed+17−13
pkgs/applications/networking/browsers/firefox/common.nix+14−2 pkgs/applications/networking/browsers/firefox/env_var_for_system_dir.patch+3−11
pkgs/applications/networking/browsers/firefox/common.nix+14−2
@@ -11,7 +11,7 @@
1111, hunspell, libevent, libstartup_notification, libvpx
1212, icu, libpng, jemalloc, glib
1313, autoconf213, which, gnused, cargo, rustc, llvmPackages
14−, rust-cbindgen, nodejs
14+, rust-cbindgen, nodejs, nasm
1515, debugBuild ? false
1616
1717### optionals
@@ -121,6 +121,12 @@ stdenv.mkDerivation rec {
121121 ]
122122 ++ lib.optionals (!isTorBrowserLike) [ nspr nss ]
123123 ++ lib.optional (lib.versionOlder ffversion "61") hunspell
124+
125+ # >= 66 requires nasm for the AV1 lib dav1d
126+ # yasm can potentially be removed in future versions
127+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1501796
128+ # https://groups.google.com/forum/#!msg/mozilla.dev.platform/o-8levmLU80/SM_zQvfzCQAJ
129+ ++ lib.optional (lib.versionAtLeast ffversion "66") nasm
124130 ++ lib.optional alsaSupport alsaLib
125131 ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed
126132 ++ lib.optional gtk3Support gtk3
@@ -188,7 +194,13 @@ stdenv.mkDerivation rec {
188194 # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution,
189195 # please get your own set of keys.
190196 echo "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI" > $TMPDIR/ga
191− configureFlagsArray+=("--with-google-api-keyfile=$TMPDIR/ga")
197+ # 60.5+ & 66+ did split the google API key arguments: https://bugzilla.mozilla.org/show_bug.cgi?id=1531176
198+ ${if (lib.versionAtLeast ffversion "60.6" && lib.versionOlder ffversion "61") || (lib.versionAtLeast ffversion "66") then ''
199+ configureFlagsArray+=("--with-google-location-service-api-keyfile=$TMPDIR/ga")
200+ configureFlagsArray+=("--with-google-safebrowsing-api-keyfile=$TMPDIR/ga")
201+ '' else ''
202+ configureFlagsArray+=("--with-google-api-keyfile=$TMPDIR/ga")
203+ ''}
192204 '' + lib.optionalString (lib.versionOlder ffversion "58") ''
193205 cd obj-*
194206 ''
pkgs/applications/networking/browsers/firefox/env_var_for_system_dir.patch+3−11
@@ -1,14 +1,6 @@
1−diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
2−index 380c1c1..255539f 100644
3−--- a/toolkit/xre/nsXREDirProvider.cpp
4−+++ b/toolkit/xre/nsXREDirProvider.cpp
5−@@ -306,7 +306,8 @@ GetSystemParentDirectory(nsIFile** aFile)
6− "/usr/lib/mozilla"
7− #endif
8− );
1+--- a/toolkit/xre/nsXREDirProvider.cpp 2019-02-28 21:00:14.157543388 +0100
2++++ b/toolkit/xre/nsXREDirProvider.cpp 2019-02-28 21:01:28.731128320 +0100
3+@@ -302 +302,2 @@
94- rv = NS_NewNativeLocalFile(dirname, false, getter_AddRefs(localDir));
105+ const char* pathVar = PR_GetEnv("MOZ_SYSTEM_DIR");
116+ rv = NS_NewNativeLocalFile((pathVar && *pathVar) ? nsDependentCString(pathVar) : reinterpret_cast<const nsCString&>(dirname), false, getter_AddRefs(localDir));
12− #endif
13−
14− if (NS_SUCCEEDED(rv)) {