* nixos-hardware-scan: don't emit an include of an "install profile".
That's confusing and wrong: nixos-hardware-scan should just enable support for the detected hardware, not enable lots of software (let alone KDE). svn path=/nixos/trunk/; revision=30325
This commit is contained in:
parent
3e30d87c26
commit
a76fe106e7
@ -230,7 +230,6 @@ print <<EOF ;
|
|||||||
|
|
||||||
{
|
{
|
||||||
require = [
|
require = [
|
||||||
"\${modulesPath}/profiles/@profile@.nix"
|
|
||||||
"\${modulesPath}/installer/scan/not-detected.nix"
|
"\${modulesPath}/installer/scan/not-detected.nix"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -49,7 +49,6 @@ let
|
|||||||
name = "nixos-hardware-scan";
|
name = "nixos-hardware-scan";
|
||||||
src = ./nixos-hardware-scan.pl;
|
src = ./nixos-hardware-scan.pl;
|
||||||
inherit (pkgs) perl;
|
inherit (pkgs) perl;
|
||||||
profile = cfg.installProfile;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
nixosOption = makeProg {
|
nixosOption = makeProg {
|
||||||
@ -103,14 +102,6 @@ in
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
installer.installProfile = pkgs.lib.mkOption {
|
|
||||||
default = "base";
|
|
||||||
example = "graphical";
|
|
||||||
description = ''
|
|
||||||
Name of the profile used when generating the hardware-scan.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
installer.enableGraphicalTools = pkgs.lib.mkOption {
|
installer.enableGraphicalTools = pkgs.lib.mkOption {
|
||||||
default = false;
|
default = false;
|
||||||
type = with pkgs.lib.types; bool;
|
type = with pkgs.lib.types; bool;
|
||||||
|
Loading…
Reference in New Issue
Block a user