Unverified Commit 4b4301bf authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #221015: firefox updates (111.0 + 102.9.0esr)

parents 5b7af1a4 78f395e4

pkgs/applications/networking/browsers/firefox-bin/release_sources.nix

+413 −393

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/networking/browsers/firefox/common.nix

+2 −1
Original line number Diff line number Diff line
@@ -228,7 +228,8 @@ buildStdenv.mkDerivation ({ 
      hash = "sha256-+wNZhkDB3HSknPRD4N6cQXY7zMT/DzNXx29jQH0Gb1o=";

    })

  ]

  ++ lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch

  ++ lib.optional (lib.versionOlder version "111") ./env_var_for_system_dir-ff86.patch

  ++ lib.optional (lib.versionAtLeast version "111") ./env_var_for_system_dir-ff111.patch

  ++ lib.optional (lib.versionAtLeast version "96") ./no-buildconfig-ffx96.patch

  ++ extraPatches;

pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff111.patch

0 → 100644
+22 −0
Original line number Diff line number Diff line 
diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp

index 6db876975187..5882c5d7f1d6 100644

--- a/toolkit/xre/nsXREDirProvider.cpp

+++ b/toolkit/xre/nsXREDirProvider.cpp

@@ -11,6 +11,7 @@

 

 #include "jsapi.h"

 #include "xpcpublic.h"

+#include "prenv.h"

 #include "prprf.h"

 

 #include "nsIAppStartup.h"

@@ -309,7 +310,8 @@ static nsresult GetSystemParentDirectory(nsIFile** aFile) {

       "/usr/lib/mozilla"_ns

 #    endif

       ;

-  rv = NS_NewNativeLocalFile(dirname, false, getter_AddRefs(localDir));

+  const char* pathVar = PR_GetEnv("MOZ_SYSTEM_DIR");

+  rv = NS_NewNativeLocalFile((pathVar && *pathVar) ? nsDependentCString(pathVar) : reinterpret_cast<const nsCString&>(dirname), false, getter_AddRefs(localDir));

 #  endif

 

   if (NS_SUCCEEDED(rv)) {

pkgs/applications/networking/browsers/firefox/packages.nix

+4 −4
Original line number Diff line number Diff line
@@ -3,10 +3,10 @@ 
rec {

  firefox = buildMozillaMach rec {

    pname = "firefox";

    version = "110.0.1";

    version = "111.0";

    src = fetchurl {

      url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";

      sha512 = "42c6a99a3874a0f60121188c43788fb35577734d9366c3f89ad41b8328cc542ce172ec81ca35b9ea551eaa698197ccdb43922ec3215d311e0770aaaa59625d21";

      sha512 = "cdb300fdbb2b60068b0fc10a18df587b417e484901d36f52dd174d320d3440a42b02ea000f325c5781fd8853a5171b1a5184562fb535ece90619e4c64d46bb82";

    };



    meta = {
@@ -29,11 +29,11 @@ rec { 


  firefox-esr-102 = buildMozillaMach rec {

    pname = "firefox-esr-102";

    version = "102.8.0esr";

    version = "102.9.0esr";

    applicationName = "Mozilla Firefox ESR";

    src = fetchurl {

      url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";

      sha512 = "93ea87997b66088b94c6e943b6e99e9a71d1908444d096c0f65b6876d2c584e55ff6120266f3851f986b664bd1f12fa31206b03479c2b751e7c3ca097ac14275";

      sha512 = "3923212ce4b7d1f589129025961ff1b380b8aaf1dd074674f3bd63cf14e9a44ff051bda556b7796c25634e153de00ce62243ece15a520f63dd0791a19b2a6685";

    };



    meta = {