public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make nixos-hardware-scan adding a profile to the generated configuration

Browse Source 
file.

svn path=/nixos/trunk/; revision=23918
This commit is contained in:
Nicolas Pierron 2010-09-25 09:33:13 +00:00
parent 5fb80fcc4b
commit c18fe31160
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/installer/tools/nixos-hardware-scan.pl
View File

@ -231,6 +231,7 @@ print <<EOF ;
{ {
require = [ require = [
"\${modulesPath}/profiles/@profile@.nix"
"\${modulesPath}/installer/scan/not-detected.nix" "\${modulesPath}/installer/scan/not-detected.nix"
]; ];

9
modules/installer/tools/tools.nix
View File

@ -80,6 +80,7 @@ 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 = config.installer.installProfile;
}; };
nixosOption = makeProg { nixosOption = makeProg {
@ -112,6 +113,14 @@ in
<command>nixos-rebuild</command> to speed up builds. <command>nixos-rebuild</command> to speed up builds.
''; '';
}; };
installer.installProfile = pkgs.lib.mkOption {
default = "base";
example = "graphical";
description = ''
Name of the profile used when generating the hardware-scan.
'';
};
}; };