Unverified Commit 2eb70664 authored by Robert Hensing's avatar Robert Hensing Committed by GitHub
Browse files

Merge pull request #259797 from K900/eval-config-pkgs 

eval-config.nix: set nixpkgs.pkgs instead of _module.args.pkgs
parents 2fe1a54b 93cfbb25

nixos/lib/eval-config.nix

+3 −5
Original line number Diff line number Diff line
@@ -34,9 +34,6 @@ evalConfigArgs@ 
                 in lib.optional (e != "") (import e)

}:



let pkgs_ = pkgs;

in



let

  inherit (lib) optional;
@@ -58,8 +55,9 @@ let 
        nixpkgs.system = lib.mkDefault system;

      })

      ++

      (optional (pkgs_ != null) {

        _module.args.pkgs = lib.mkForce pkgs_;

      (optional (pkgs != null) {

        # This should be default priority, so it conflicts with any user-defined pkgs.

        nixpkgs.pkgs = pkgs;

      })

    );

  };