commit 7deb425286c74837946917888ed74a23de1f9f68 · pyrox.dev/nixpkgs

-10

nixos/modules/misc/extra-arguments.nix

···

       2
       2
        
       

     

       3
       3
        
       {

     

       4
       4
        
         _module.args = {

     

       5
       5
       -
           pkgs_i686 = import ../../.. {

     

       6
       6
       -
             system = "i686-linux";

     

       7
       7
       -
             # FIXME: we enable config.allowUnfree to make packages like

     

       8
       8
       -
             # nvidia-x11 available. This isn't a problem because if the user has

     

       9
       9
       -
             # ‘nixpkgs.config.allowUnfree = false’, then evaluation will fail on

     

       10
       10
       -
             # the 64-bit package anyway. However, it would be cleaner to respect

     

       11
       11
       -
             # nixpkgs.config here.

     

       12
       12
       -
             config.allowUnfree = true;

     

       13
       13
       -
           };

     

       14
       14
       -
       

     

       15
       5
        
           utils = import ../../lib/utils.nix pkgs;

     

       16
       6
        
         };

     

       17
       7
        
       }

+6 -1

nixos/modules/misc/nixpkgs.nix

···

       42
       42
        
           merge = lib.mergeOneOption;

     

       43
       43
        
         };

     

       44
       44
        
       

     

       45
       45
       +
         _pkgs = import ../../.. config.nixpkgs;

     

       46
       46
       +
       

     

       45
       47
        
       in

     

       46
       48
        
       

     

       47
       49
        
       {

     
···

       97
       99
        
         };

     

       98
       100
        
       

     

       99
       101
        
         config = {

     

       100
       100
       -
           _module.args.pkgs = import ../../.. config.nixpkgs;

     

       102
       102
       +
           _module.args = {

     

       103
       103
       +
             pkgs = _pkgs;

     

       104
       104
       +
             pkgs_i686 = _pkgs.pkgsi686Linux;

     

       105
       105
       +
           };

     

       101
       106
        
         };

     

       102
       107
        
       }