firefox-devedition-unwrapped: fix branding (#389712)

2025-03-16 01:02:00 +01:00
parent 11bcef1654 a8cf34bf84
commit d15b2e4fca
1 changed files with 3 additions and 1 deletions
@@ -481,7 +481,9 @@ buildStdenv.mkDerivation {
    (enableFeature enableDebugSymbols "debug-symbols")
  ]
  ++ lib.optionals enableDebugSymbols [ "--disable-strip" "--disable-install-strip" ]
-  ++ lib.optional enableOfficialBranding "--enable-official-branding"
+  # As of Firefox 137 (https://bugzilla.mozilla.org/show_bug.cgi?id=1943009),
+  # the --enable-official-branding flag overrides the --with-branding flag.
+  ++ lib.optional (enableOfficialBranding && branding == null) "--enable-official-branding"
  ++ lib.optional (branding != null) "--with-branding=${branding}"
  ++ extraConfigureFlags;