firefoxCommon: expose as attribute

This will make it easier to build custom versions of Firefox.

1 files changed, 12 insertions, 13 deletions

diff --git a/nixpkgs/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix
index 1943e83139ac..a0455db1d364 100644
--- a/nixpkgs/pkgs/top-level/all-packages.nix
+++ b/nixpkgs/pkgs/top-level/all-packages.nix
@@ -17120,19 +17120,18 @@ in
 
   filezilla = callPackage ../applications/networking/ftp/filezilla { };
 
-  firefoxPackages = recurseIntoAttrs (callPackage ../applications/networking/browsers/firefox/packages.nix {
-    callPackage = pkgs.newScope {
-      inherit (gnome2) libIDL;
-      libpng = libpng_apng;
-      python = python2;
-      gnused = gnused_422;
-      icu = icu63;
-      inherit (darwin.apple_sdk.frameworks) CoreMedia ExceptionHandling
-                                            Kerberos AVFoundation MediaToolbox
-                                            CoreLocation Foundation AddressBook;
-      inherit (darwin) libobjc;
-    };
-  });
+  firefoxCommon = args: callPackage (import ../applications/networking/browsers/firefox/common.nix args) {
+    inherit (gnome2) libIDL;
+    libpng = libpng_apng;
+    gnused = gnused_422;
+    icu = icu63;
+    inherit (darwin.apple_sdk.frameworks) CoreMedia ExceptionHandling
+                                          Kerberos AVFoundation MediaToolbox
+                                          CoreLocation Foundation AddressBook;
+    inherit (darwin) libobjc;
+  };
+
+  firefoxPackages = recurseIntoAttrs (callPackage ../applications/networking/browsers/firefox/packages.nix { });
 
   firefox-unwrapped = firefoxPackages.firefox;
   firefox-esr-52-unwrapped = firefoxPackages.firefox-esr-52;