parent
99a531da75
commit
d4e479aae7
pkgs/applications/networking/browsers/firefox
@ -8,7 +8,7 @@
|
|||||||
, yasm, libGLU, libGL, sqlite, unzip, makeWrapper
|
, yasm, libGLU, libGL, sqlite, unzip, makeWrapper
|
||||||
, hunspell, libXdamage, libevent, libstartup_notification
|
, hunspell, libXdamage, libevent, libstartup_notification
|
||||||
, libvpx, libvpx_1_8
|
, libvpx, libvpx_1_8
|
||||||
, icu, libpng, jemalloc, glib
|
, icu, icu67, libpng, jemalloc, glib
|
||||||
, autoconf213, which, gnused, cargo, rustc, llvmPackages
|
, autoconf213, which, gnused, cargo, rustc, llvmPackages
|
||||||
, rust-cbindgen, nodejs, nasm, fetchpatch
|
, rust-cbindgen, nodejs, nasm, fetchpatch
|
||||||
, debugBuild ? false
|
, debugBuild ? false
|
||||||
@ -111,7 +111,7 @@ stdenv.mkDerivation ({
|
|||||||
xorg.libXScrnSaver xorg.xorgproto
|
xorg.libXScrnSaver xorg.xorgproto
|
||||||
xorg.libXext unzip makeWrapper
|
xorg.libXext unzip makeWrapper
|
||||||
libevent libstartup_notification /* cairo */
|
libevent libstartup_notification /* cairo */
|
||||||
icu libpng jemalloc glib
|
libpng jemalloc glib
|
||||||
nasm
|
nasm
|
||||||
# >= 66 requires nasm for the AV1 lib dav1d
|
# >= 66 requires nasm for the AV1 lib dav1d
|
||||||
# yasm can potentially be removed in future versions
|
# yasm can potentially be removed in future versions
|
||||||
@ -119,8 +119,10 @@ stdenv.mkDerivation ({
|
|||||||
# https://groups.google.com/forum/#!msg/mozilla.dev.platform/o-8levmLU80/SM_zQvfzCQAJ
|
# https://groups.google.com/forum/#!msg/mozilla.dev.platform/o-8levmLU80/SM_zQvfzCQAJ
|
||||||
nspr nss
|
nspr nss
|
||||||
]
|
]
|
||||||
++ lib.optionals (lib.versionOlder ffversion "75") [ libvpx sqlite ]
|
++ lib.optionals (lib.versionOlder ffversion "75") [ libvpx sqlite ]
|
||||||
++ lib.optional (lib.versionAtLeast ffversion "75.0") libvpx_1_8
|
++ lib.optional (lib.versionAtLeast ffversion "75.0") libvpx_1_8
|
||||||
|
++ lib.optional (lib.versionOlder ffversion "78") icu
|
||||||
|
++ lib.optional (lib.versionAtLeast ffversion "78.0") icu67
|
||||||
++ lib.optional alsaSupport alsaLib
|
++ lib.optional alsaSupport alsaLib
|
||||||
++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed
|
++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed
|
||||||
++ lib.optional gtk3Support gtk3
|
++ lib.optional gtk3Support gtk3
|
||||||
@ -200,7 +202,6 @@ stdenv.mkDerivation ({
|
|||||||
"--enable-application=browser"
|
"--enable-application=browser"
|
||||||
"--with-system-jpeg"
|
"--with-system-jpeg"
|
||||||
"--with-system-zlib"
|
"--with-system-zlib"
|
||||||
"--with-system-bz2"
|
|
||||||
"--with-system-libevent"
|
"--with-system-libevent"
|
||||||
"--with-system-libvpx"
|
"--with-system-libvpx"
|
||||||
"--with-system-png" # needs APNG support
|
"--with-system-png" # needs APNG support
|
||||||
@ -208,19 +209,21 @@ stdenv.mkDerivation ({
|
|||||||
"--enable-system-ffi"
|
"--enable-system-ffi"
|
||||||
"--enable-system-pixman"
|
"--enable-system-pixman"
|
||||||
#"--enable-system-cairo"
|
#"--enable-system-cairo"
|
||||||
"--enable-startup-notification"
|
|
||||||
#"--enable-content-sandbox" # TODO: probably enable after 54
|
|
||||||
"--disable-tests"
|
"--disable-tests"
|
||||||
"--disable-necko-wifi" # maybe we want to enable this at some point
|
"--disable-necko-wifi" # maybe we want to enable this at some point
|
||||||
"--disable-updater"
|
"--disable-updater"
|
||||||
"--enable-jemalloc"
|
"--enable-jemalloc"
|
||||||
"--disable-gconf"
|
|
||||||
"--enable-default-toolkit=${default-toolkit}"
|
"--enable-default-toolkit=${default-toolkit}"
|
||||||
"--with-libclang-path=${llvmPackages.libclang}/lib"
|
"--with-libclang-path=${llvmPackages.libclang}/lib"
|
||||||
"--with-clang-path=${llvmPackages.clang}/bin/clang"
|
"--with-clang-path=${llvmPackages.clang}/bin/clang"
|
||||||
"--with-system-nspr"
|
"--with-system-nspr"
|
||||||
"--with-system-nss"
|
"--with-system-nss"
|
||||||
]
|
]
|
||||||
|
++ lib.optionals (lib.versionOlder ffversion "78") [
|
||||||
|
"--with-system-bz2"
|
||||||
|
"--enable-startup-notification"
|
||||||
|
"--disable-gconf"
|
||||||
|
]
|
||||||
++ lib.optional (lib.versionOlder ffversion "75") "--enable-system-sqlite"
|
++ lib.optional (lib.versionOlder ffversion "75") "--enable-system-sqlite"
|
||||||
++ lib.optional (stdenv.isDarwin) "--disable-xcode-checks"
|
++ lib.optional (stdenv.isDarwin) "--disable-xcode-checks"
|
||||||
++ lib.optionals (lib.versionOlder ffversion "69") [
|
++ lib.optionals (lib.versionOlder ffversion "69") [
|
||||||
|
@ -7,10 +7,10 @@ in
|
|||||||
rec {
|
rec {
|
||||||
firefox = common rec {
|
firefox = common rec {
|
||||||
pname = "firefox";
|
pname = "firefox";
|
||||||
ffversion = "77.0.1";
|
ffversion = "78.0.1";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
|
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
|
||||||
sha512 = "ngLihC0YuclLJEV3iPEX+tRzDKIdBe+CCOuFxvWNo7DnX8royOvTj2m4YyWyZoTQ5UCbPTQYmP4otgfovZSe8g==";
|
sha512 = "mdO6masIpiZBvYi6kpYUTSnsOda04CUs2CL1LNf1Yad+rfY4ga4aFuLtfKqfgV5IcIIl86XeiC+0grd4irbCYg==";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
Loading…
Reference in New Issue
Block a user