diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-01-27 14:35:45 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-01-27 15:08:17 +0000 |
| commit | 9a8d4b8a44c6adb40bfe09cb6f070ca8ab730783 (patch) | |
| tree | 105cf0cd82a59f97dce3c5c0c8d94f9e2f0ab238 /nixpkgs/pkgs | |
| parent | a69372cfd69fca87ec25a5b393ba074e00eff658 (diff) | |
| download | nixlib-9a8d4b8a44c6adb40bfe09cb6f070ca8ab730783.tar nixlib-9a8d4b8a44c6adb40bfe09cb6f070ca8ab730783.tar.gz nixlib-9a8d4b8a44c6adb40bfe09cb6f070ca8ab730783.tar.bz2 nixlib-9a8d4b8a44c6adb40bfe09cb6f070ca8ab730783.tar.lz nixlib-9a8d4b8a44c6adb40bfe09cb6f070ca8ab730783.tar.xz nixlib-9a8d4b8a44c6adb40bfe09cb6f070ca8ab730783.tar.zst nixlib-9a8d4b8a44c6adb40bfe09cb6f070ca8ab730783.zip | |
firefoxCommon: expose as attribute
This will make it easier to build custom versions of Firefox.
Diffstat (limited to 'nixpkgs/pkgs')
| -rw-r--r-- | nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix | 18 | ||||
| -rw-r--r-- | nixpkgs/pkgs/top-level/all-packages.nix | 25 |
2 files changed, 18 insertions, 25 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; 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; |