From fd6a66f882a6e718f58bfccf03b041da8bb71e88 Mon Sep 17 00:00:00 2001 From: taku0 Date: Mon, 21 Sep 2020 15:13:00 +0900 Subject: [PATCH] firefox: 80.0.1 -> 81.0 (cherry picked from commit 0669cd9d3f34e78c214892aec7ab40e514556857) --- pkgs/applications/networking/browsers/firefox/common.nix | 2 ++ pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index b9d95f6d49a9..bcc5ee132bbd 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -159,6 +159,8 @@ stdenv.mkDerivation ({ ++ lib.optional (pname == "firefox-esr" && lib.versionOlder ffversion "69") "-Wno-error=format-security"); + MACH_USE_SYSTEM_PYTHON = "1"; + postPatch = '' rm -rf obj-x86_64-pc-linux-gnu '' + lib.optionalString (lib.versionAtLeast ffversion "80") '' diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index b05414150666..77c739b1d5b6 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "80.0.1"; + ffversion = "81.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "081sf41r7ickjij3kfrdq29a0d6wz7qv8950kx116kakh8qxgjy8ahk2mfwlcp6digrl4mimi8rl7ns1wjngsmrjh4lvqzh1xglx9cp"; + sha512 = "1dnxn754vb99mccqrj3wr3pg2scjy42rvs5xc6bw022gh6n8kgipx9pbkapwfivkglynxmmbw1k11ak34zhr1g6p31m3550ad6azq19"; }; patches = [