From 2050e84bb86d3a02e6519155f9bcb52d6ee426c2 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sun, 17 Jan 2021 00:06:20 -0800 Subject: [PATCH] nix/eval.nix: Support setting meta.nixpkgs to a .nix that returns an initialized Nixpkgs attrset --- src/nix/eval.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/nix/eval.nix b/src/nix/eval.nix index 9c56384..ab0b8ec 100644 --- a/src/nix/eval.nix +++ b/src/nix/eval.nix @@ -93,7 +93,8 @@ let mkNixpkgs = configName: pkgConf: if typeOf pkgConf == "path" then - import pkgConf {} + # The referenced file might return an initialized Nixpkgs attribute set directly + mkNixpkgs configName (import pkgConf) else if typeOf pkgConf == "lambda" then pkgConf {} else if typeOf pkgConf == "set" then