···

       
1
       
1
       
 
       
# Evaluate `release.nix' like Hydra would.  Too bad nix-instantiate

     

       
2
       
2
       
 
       
# can't to do this.

     

       
3
       
3
       
 
       


     

       
4
       
4
       
-
       
with import ../../pkgs/lib;

     

       
4
       
4
       
+
       
with import ../../lib;

     

       
5
       
5
       
 
       


     

       
6
       
6
       
 
       
let

     

       
7
       
7
       
 
       
  trace = if builtins.getEnv "VERBOSE" == "1" then builtins.trace else (x: y: y);

     

···

       
1
       
1
       
-
       
{ stdenv, browser, makeDesktopItem, makeWrapper, plugins, libs, gtk_modules

     

       
1
       
1
       
+
       
{ stdenv, lib, browser, makeDesktopItem, makeWrapper, plugins, libs, gtk_modules

     

       
2
       
2
       
 
       
, browserName, desktopName, nameSuffix, icon

     

       
3
       
3
       
 
       
}:

     

       
4
       
4
       
 
       


     
···

       
50
       
50
       
 
       
    description =

     

       
51
       
51
       
 
       
      browser.meta.description

     

       
52
       
52
       
 
       
      + " (with plugins: "

     

       
53
       
53
       
-
       
      + (let lib = import ../../../../lib;

     

       
54
       
54
       
-
       
        in lib.concatStrings (lib.intersperse ", " (map (x: x.name) plugins)))

     

       
53
       
53
       
+
       
      + lib.concatStrings (lib.intersperse ", " (map (x: x.name) plugins))

     

       
55
       
54
       
 
       
      + ")";

     

       
56
       
55
       
 
       
  };

     

       
57
       
56
       
 
       
}

     

···

       
14
       
14
       
 
       


     

       
15
       
15
       
 
       
let

     

       
16
       
16
       
 
       


     

       
17
       
17
       
-
       
  lib = import ../../lib;

     

       
17
       
17
       
+
       
  lib = import ../../../lib;

     

       
18
       
18
       
 
       


     

       
19
       
19
       
 
       
  allowUnfree = config.allowUnfree or true && builtins.getEnv "HYDRA_DISALLOW_UNFREE" != "1";

     

       
20
       
20
       
 
       


     

···

       
46
       
46
       
 
       


     

       
47
       
47
       
 
       
let

     

       
48
       
48
       
 
       


     

       
49
       
49
       
-
       
  lib = import ../lib;

     

       
49
       
49
       
+
       
  lib = import ../../lib;

     

       
50
       
50
       
 
       


     

       
51
       
51
       
 
       
  # The contents of the configuration file found at $NIXPKGS_CONFIG or

     

       
52
       
52
       
 
       
  # $HOME/.nixpkgs/config.nix.

     
···

       
381
       
381
       
 
       
    inherit pkgs;

     

       
382
       
382
       
 
       
  };

     

       
383
       
383
       
 
       


     

       
384
       
384
       
-
       
  composableDerivation = (import ../lib/composable-derivation.nix) {

     

       
384
       
384
       
+
       
  composableDerivation = (import ../../lib/composable-derivation.nix) {

     

       
385
       
385
       
 
       
    inherit pkgs lib;

     

       
386
       
386
       
 
       
  };

     

       
387
       
387
       
 
       


     
···

       
8886
       
8886
       
 
       
      enableGnash = cfg.enableGnash or false;

     

       
8887
       
8887
       
 
       
    in

     

       
8888
       
8888
       
 
       
    import ../applications/networking/browsers/firefox/wrapper.nix {

     

       
8889
       
8889
       
-
       
      inherit stdenv makeWrapper makeDesktopItem browser browserName desktopName nameSuffix icon;

     

       
8889
       
8889
       
+
       
      inherit stdenv lib makeWrapper makeDesktopItem browser browserName desktopName nameSuffix icon;

     

       
8890
       
8890
       
 
       
      plugins =

     

       
8891
       
8891
       
 
       
         assert !(enableGnash && enableAdobeFlash);

     

       
8892
       
8892
       
 
       
         ([ ]