Commit e53c99eb authored by K900's avatar K900
Browse files

treewide: use `pkgs.config` instead of `config.nixpkgs.config` 

`pkgs` may be passed in externally, in which case `config.nixpkgs.config` will not be set.

Follow-up to #257458.
parent 58aa6737

nixos/modules/hardware/all-firmware.nix

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ in { 
    })

    (mkIf cfg.enableAllFirmware {

      assertions = [{

        assertion = !cfg.enableAllFirmware || config.nixpkgs.config.allowUnfree;

        assertion = !cfg.enableAllFirmware || pkgs.config.allowUnfree;

        message = ''

          the list of hardware.enableAllFirmware contains non-redistributable licensed firmware files.

            This requires nixpkgs.config.allowUnfree to be true.

nixos/modules/programs/firefox.nix

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ in 
          # copy-pasted from the wrapper; TODO: figure out fix

          applicationName = cfg.package.binaryName or (lib.getName cfg.package);



          nixpkgsConfig = config.nixpkgs.config.${applicationName} or {};

          nixpkgsConfig = pkgs.config.${applicationName} or {};

          optionConfig = cfg.wrapperConfig;

          nmhConfig = {

            enableBrowserpass = nmh.browserpass;

nixos/modules/virtualisation/virtualbox-host.nix

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ in 
  };



  config = mkIf cfg.enable (mkMerge [{

    warnings = mkIf (config.nixpkgs.config.virtualbox.enableExtensionPack or false)

    warnings = mkIf (pkgs.config.virtualbox.enableExtensionPack or false)

      ["'nixpkgs.virtualbox.enableExtensionPack' has no effect, please use 'virtualisation.virtualbox.host.enableExtensionPack'"];

    boot.kernelModules = [ "vboxdrv" "vboxnetadp" "vboxnetflt" ];

    boot.extraModulePackages = [ kernelModules ];