firefoxCommon: expose as attribute

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

1 files changed, 6 insertions, 12 deletions

diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
index adb901518de3..4f2e98a16287 100644
--- a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -1,14 +1,8 @@
-{ lib, callPackage, stdenv, fetchurl, fetchFromGitHub, fetchpatch, python3 }:
-
-let
-
-  common = opts: callPackage (import ./common.nix opts) {};
-
-in
+{ lib, callPackage, fetchurl, fetchFromGitHub, firefoxCommon, python3 }:
 
 rec {
 
-  firefox = common rec {
+  firefox = firefoxCommon rec {
     pname = "firefox";
     ffversion = "64.0";
     src = fetchurl {
@@ -36,7 +30,7 @@ rec {
     };
   };
 
-  firefox-esr-52 = common rec {
+  firefox-esr-52 = firefoxCommon rec {
     pname = "firefox-esr";
     ffversion = "52.9.0esr";
     src = fetchurl {
@@ -63,7 +57,7 @@ rec {
     };
   };
 
-  firefox-esr-60 = common rec {
+  firefox-esr-60 = firefoxCommon rec {
     pname = "firefox-esr";
     ffversion = "60.4.0esr";
     src = fetchurl {
@@ -90,7 +84,7 @@ rec {
     };
   };
 
-  firefox-beta = common rec {
+  firefox-beta = firefoxCommon rec {
     pname = "firefox";
     ffversion = "65.0b12";
     src = fetchurl {
@@ -116,7 +110,7 @@ rec {
 
 } // (let
 
-  tbcommon = args: common (args // {
+  tbcommon = args: firefoxCommon (args // {
     pname = "tor-browser";
     isTorBrowserLike = true;