about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2015-09-03 10:54:13 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2015-09-03 11:15:53 +0200
commita536eda82e88dba648572334d9531af8012fdf59 (patch)
tree1c26ef44f952500336a20258962e88d02b70b06e /pkgs/top-level
parente27c796b51c277a4faceeb25604133582c67448d (diff)
downloadnixlib-a536eda82e88dba648572334d9531af8012fdf59.tar
nixlib-a536eda82e88dba648572334d9531af8012fdf59.tar.gz
nixlib-a536eda82e88dba648572334d9531af8012fdf59.tar.bz2
nixlib-a536eda82e88dba648572334d9531af8012fdf59.tar.lz
nixlib-a536eda82e88dba648572334d9531af8012fdf59.tar.xz
nixlib-a536eda82e88dba648572334d9531af8012fdf59.tar.zst
nixlib-a536eda82e88dba648572334d9531af8012fdf59.zip
Add firefox-esr
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix8
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3910bbbb0640..35c0d809f43f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11527,14 +11527,15 @@ let
 
   filezilla = callPackage ../applications/networking/ftp/filezilla { };
 
-  firefox = callPackage ../applications/networking/browsers/firefox {
+  inherit (callPackages ../applications/networking/browsers/firefox {
     inherit (gnome) libIDL;
     inherit (pythonPackages) pysqlite;
     libpng = libpng_apng;
     enableGTK3 = false;
-  };
+  }) firefox firefox-esr;
 
-  firefoxWrapper = wrapFirefox { browser = pkgs.firefox; };
+  firefox-wrapper = wrapFirefox { browser = pkgs.firefox; };
+  firefox-esr-wrapper = wrapFirefox { browser = pkgs.firefox-esr; };
 
   firefox-bin = callPackage ../applications/networking/browsers/firefox-bin {
     gconf = pkgs.gnome.GConf;
@@ -15331,6 +15332,7 @@ let
   cheetahTemplate = pythonPackages.cheetah; # 2015-06-15
   clangAnalyzer = clang-analyzer;  # added 2015-02-20
   cool-old-term = cool-retro-term; # added 2015-01-31
+  firefoxWrapper = firefox-wrapper;
   haskell-ng = haskell;                 # 2015-04-19
   haskellngPackages = haskellPackages;  # 2015-04-19
   htmlTidy = html-tidy;  # added 2014-12-06