Unverified Commit 4e9ddbc8 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Update all Firefox/Thunderbird packages (#352161)

parents 2fcea20c bfef1419

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

+413 −413

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix

+413 −413

File changed.

Preview size limit exceeded, changes collapsed.

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

+413 −413

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
@@ -234,7 +234,8 @@ buildStdenv.mkDerivation { 
    "profilingPhase"

  ];



  patches = lib.optionals (lib.versionAtLeast version "111") [ ./env_var_for_system_dir-ff111.patch ]

  patches = lib.optionals (lib.versionAtLeast version "111" && lib.versionOlder version "133") [ ./env_var_for_system_dir-ff111.patch ]

  ++ lib.optionals (lib.versionAtLeast version "133") [ ./env_var_for_system_dir-ff133.patch ]

  ++ lib.optionals (lib.versionAtLeast version "96" && lib.versionOlder version "121") [ ./no-buildconfig-ffx96.patch ]

  ++ lib.optionals (lib.versionAtLeast version "121") [ ./no-buildconfig-ffx121.patch ]

  ++ lib.optionals (lib.versionOlder version "128.2" || (lib.versionAtLeast version "129" && lib.versionOlder version "130")) [

pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff133.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"

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

       "/usr/lib/mozilla"_ns

 #    endif

       ;

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

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

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

 #  endif

 

   if (NS_SUCCEEDED(rv)) {