mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-14 06:00:33 +03:00
Added option for external firmware.
svn path=/nixos/trunk/; revision=9379
This commit is contained in:
parent
c43dc7b013
commit
cf1140ee11
2 changed files with 13 additions and 1 deletions
|
@ -964,6 +964,16 @@
|
||||||
";
|
";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
name = ["services" "udev" "addFirmware"];
|
||||||
|
default = [];
|
||||||
|
example = ["/mnt/big-storage/firmware/"];
|
||||||
|
description = "
|
||||||
|
To specify firmware that is not too spread to ensure
|
||||||
|
a package, or have an interactive process of extraction
|
||||||
|
and cannot be redistributed.
|
||||||
|
";
|
||||||
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
name = ["installer" "nixpkgsURL"];
|
name = ["installer" "nixpkgsURL"];
|
||||||
|
|
|
@ -30,7 +30,9 @@ import ../upstart-jobs/gather.nix {
|
||||||
inherit (pkgs) stdenv writeText substituteAll udev procps;
|
inherit (pkgs) stdenv writeText substituteAll udev procps;
|
||||||
inherit (pkgs.lib) cleanSource;
|
inherit (pkgs.lib) cleanSource;
|
||||||
firmwareDirs =
|
firmwareDirs =
|
||||||
pkgs.lib.optional (config.get ["networking" "enableIntel2200BGFirmware"]) pkgs.ipw2200fw;
|
pkgs.lib.optional (config.get ["networking" "enableIntel2200BGFirmware"]) pkgs.ipw2200fw
|
||||||
|
++
|
||||||
|
(config.get ["services" "udev" "addFirmware"]);
|
||||||
extraUdevPkgs =
|
extraUdevPkgs =
|
||||||
pkgs.lib.optional (config.get ["services" "hal" "enable"]) pkgs.hal;
|
pkgs.lib.optional (config.get ["services" "hal" "enable"]) pkgs.hal;
|
||||||
})
|
})
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue