brave, brave-origin: fix overriding (#545834)

pkgs/applications/networking/browsers/brave/default.nix

@@ -28,7 +28,7 @@ let
       pkg = import release;
       fd = flavorData.${pkg.flavor or "browser"};
     in
-    callPackage ./make-brave.nix { } (pkg // fd);
+    callPackage ((import ./make-brave.nix) (pkg // fd)) { };
 
 in
 {

pkgs/applications/networking/browsers/brave/make-brave.nix

@@ -1,3 +1,24 @@
+{
+  pname,
+  version,
+  # Map from Nix system strings ("x86_64-linux", "aarch64-darwin", ...) to
+  # the corresponding upstream `{ url, hash }` record. Encoding the per-system
+  # sources as data rather than positional arguments lets channel-specific
+  # package.nix files drop platforms that upstream hasn't published yet.
+  archives,
+  # Upstream product flavor: "browser" (the regular Brave) or "origin" (the
+  # stripped-down Brave Origin).
+  flavor ? "browser",
+  # Flavor-specific paths supplied by the caller (default.nix).
+  optStem,
+  fileStem,
+  appIdStem,
+  darwinStem,
+  changelogFile,
+  homepage,
+  innerBinary,
+}:
+
 {
   lib,
   stdenv,
@@ -69,27 +90,6 @@
   enableVulkan ? vulkanSupport,
 }:
 
-{
-  pname,
-  version,
-  # Map from Nix system strings ("x86_64-linux", "aarch64-darwin", ...) to
-  # the corresponding upstream `{ url, hash }` record. Encoding the per-system
-  # sources as data rather than positional arguments lets channel-specific
-  # package.nix files drop platforms that upstream hasn't published yet.
-  archives,
-  # Upstream product flavor: "browser" (the regular Brave) or "origin" (the
-  # stripped-down Brave Origin).
-  flavor ? "browser",
-  # Flavor-specific paths supplied by the caller (default.nix).
-  optStem,
-  fileStem,
-  appIdStem,
-  darwinStem,
-  changelogFile,
-  homepage,
-  innerBinary,
-}:
-
 let
   inherit (lib)
     optional