diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index f7c92be9a8a..f623f78a5cb 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -163,23 +163,6 @@ buildStdenv.mkDerivation ({ sha256 = "0qc62di5823r7ly2lxkclzj9rhg2z7ms81igz44nv0fzv3dszdab"; }) - # These fix Firefox on sway and other non-Gnome wayland WMs. They should be - # removed whenever the following two patches make it onto a release: - # 1. https://hg.mozilla.org/mozilla-central/rev/51c13987d1b8 - # 2. https://hg.mozilla.org/integration/autoland/rev/3b856ecc00e4 - # This will probably happen in the next point release, but let's be careful - # and double check whether it's working on sway on the next v bump. - ++ lib.optionals (lib.versionAtLeast ffversion "92") [ - (fetchpatch { - url = "https://hg.mozilla.org/integration/autoland/raw-rev/3b856ecc00e4"; - sha256 = "sha256-d8IRJD6ELC3ZgEs1ES/gy2kTNu/ivoUkUNGMEUoq8r8="; - }) - (fetchpatch { - url = "https://hg.mozilla.org/mozilla-central/raw-rev/51c13987d1b8"; - sha256 = "sha256-C2jcoWLuxW0Ic+Mbh3UpEzxTKZInljqVdcuA9WjspoA="; - }) - ] - ++ patches; @@ -270,6 +253,7 @@ buildStdenv.mkDerivation ({ # this will run autoconf213 configureScript="$(realpath ./mach) configure" export MOZCONFIG=$(pwd)/mozconfig + export MOZBUILD_STATE_PATH=$(pwd)/mozbuild # Set C flags for Rust's bindgen program. Unlike ordinary C # compilation, bindgen does not invoke $CC directly. Instead it diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index ed1351cf8d6..2209f2563bc 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 = "92.0"; + ffversion = "93.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "1a73cc275ea1790120845f579a7d21713ea78db0867ced767f393dfc25b132292dfbb673290fccdb9dcde86684e0300d56565841985fa3f0115376c91154ba8e"; + sha512 = "b29890e331819d47201b599b9feaaa7eaa0b02088fcbf980efc4f289d43da4f73970bf35ba2f763a2a892fd5318deb68cb9a66e71e9bc0c603642434c7e32e91"; }; meta = {