commit a536eda82e88dba648572334d9531af8012fdf59 · pyrox.dev/nixpkgs

+22 -6

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

···

       16
       16
        
       

     

       17
       17
        
       assert stdenv.cc ? libc && stdenv.cc.libc != null;

     

       18
       18
        
       

     

       19
       19
       -
       let version = "40.0.3"; in

     

       19
       19
       +
       let

     

       20
       20
        
       

     

       21
       21
       -
       stdenv.mkDerivation rec {

     

       22
       22
       -
         name = "firefox-${version}";

     

       21
       21
       +
       common = { pname, version, sha1 }: stdenv.mkDerivation rec {

     

       22
       22
       +
         name = "${pname}-${version}";

     

       23
       23
        
       

     

       24
       24
        
         src = fetchurl {

     

       25
       25
        
           url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2";

     

       26
       26
       -
           sha1 = "6ddda46bd6540ab3ae932fbb5ffec8e9a85cab13";

     

       26
       26
       +
           inherit sha1;

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         patches = if !enableGTK3 then null else [(fetchpatch {

     
···

       91
       91
        
           ''

     

       92
       92
        
             mkdir ../objdir

     

       93
       93
        
             cd ../objdir

     

       94
       94
       -
             configureScript=../mozilla-release/configure

     

       94
       94
       +
             configureScript=../mozilla-*/configure

     

       95
       95
        
           '';

     

       96
       96
        
       

     

       97
       97
        
         preInstall =

     
···

       121
       121
        
           '';

     

       122
       122
        
       

     

       123
       123
        
         meta = {

     

       124
       124
       -
           description = "Web browser";

     

       124
       124
       +
           description = "A web browser" + lib.optionalString (pname == "firefox-esr") " (Extended Support Release)";

     

       125
       125
        
           homepage = http://www.mozilla.com/en-US/firefox/;

     

       126
       126
        
           maintainers = with lib.maintainers; [ eelco ];

     

       127
       127
        
           platforms = lib.platforms.linux;

     
···

       131
       131
        
           inherit gtk nspr version;

     

       132
       132
        
           isFirefox3Like = true;

     

       133
       133
        
         };

     

       134
       134
       +
       };

     

       135
       135
       +
       

     

       136
       136
       +
       in {

     

       137
       137
       +
       

     

       138
       138
       +
         firefox = common {

     

       139
       139
       +
           pname = "firefox";

     

       140
       140
       +
           version = "40.0.3";

     

       141
       141
       +
           sha1 = "6ddda46bd6540ab3ae932fbb5ffec8e9a85cab13";

     

       142
       142
       +
         };

     

       143
       143
       +
       

     

       144
       144
       +
         firefox-esr = common {

     

       145
       145
       +
           pname = "firefox-esr";

     

       146
       146
       +
           version = "38.2.1esr";

     

       147
       147
       +
           sha1 = "c596174e7273be5079bf55aecde33ec191d99538";

     

       148
       148
       +
         };

     

       149
       149
       +
       

     

       134
       150
        
       }

+5 -3

pkgs/top-level/all-packages.nix

···

       11527
       11527
        
       

     

       11528
       11528
        
         filezilla = callPackage ../applications/networking/ftp/filezilla { };

     

       11529
       11529
        
       

     

       11530
       11530
       -
         firefox = callPackage ../applications/networking/browsers/firefox {

     

       11530
       11530
       +
         inherit (callPackages ../applications/networking/browsers/firefox {

     

       11531
       11531
        
           inherit (gnome) libIDL;

     

       11532
       11532
        
           inherit (pythonPackages) pysqlite;

     

       11533
       11533
        
           libpng = libpng_apng;

     

       11534
       11534
        
           enableGTK3 = false;

     

       11535
       11535
       -
         };

     

       11535
       11535
       +
         }) firefox firefox-esr;

     

       11536
       11536
        
       

     

       11537
       11537
       -
         firefoxWrapper = wrapFirefox { browser = pkgs.firefox; };

     

       11537
       11537
       +
         firefox-wrapper = wrapFirefox { browser = pkgs.firefox; };

     

       11538
       11538
       +
         firefox-esr-wrapper = wrapFirefox { browser = pkgs.firefox-esr; };

     

       11538
       11539
        
       

     

       11539
       11540
        
         firefox-bin = callPackage ../applications/networking/browsers/firefox-bin {

     

       11540
       11541
        
           gconf = pkgs.gnome.GConf;

     
···

       15331
       15332
        
         cheetahTemplate = pythonPackages.cheetah; # 2015-06-15

     

       15332
       15333
        
         clangAnalyzer = clang-analyzer;  # added 2015-02-20

     

       15333
       15334
        
         cool-old-term = cool-retro-term; # added 2015-01-31

     

       15335
       15335
       +
         firefoxWrapper = firefox-wrapper;

     

       15334
       15336
        
         haskell-ng = haskell;                 # 2015-04-19

     

       15335
       15337
        
         haskellngPackages = haskellPackages;  # 2015-04-19

     

       15336
       15338
        
         htmlTidy = html-tidy;  # added 2014-12-06