diff --git a/nixos/modules/packages.nix b/nixos/modules/packages.nix index d6518dcf290c27b95e3428434623a63cfbdb8e19..c4390dc00f3948e04e3e90ef270261cc0dd1cdbb 100644 --- a/nixos/modules/packages.nix +++ b/nixos/modules/packages.nix @@ -1,8 +1,13 @@ # A NixOS module which exposes custom packages to other modules. { pkgs, ...}: -{ +let + ourpkgs = pkgs.callPackage ../../nixos/pkgs {}; +in { config = { # Expose `nixos/pkgs` as a new module argument `ourpkgs`. - _module.args.ourpkgs = pkgs.callPackage ../../nixos/pkgs {}; + _module.args.ourpkgs = ourpkgs; + # Also expose it as a config setting, for usage by tests, + # since the `_module` config is not exposed in the result. + passthru.ourpkgs = ourpkgs; }; }