From 51226335926fdab35f81733d7abe6caef450a32b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 18 Feb 2008 16:50:08 +0000 Subject: [PATCH] Add support for Intel's 4965AGN firmware. svn path=/nixos/trunk/; revision=10735 --- system/options.nix | 10 +++++++++- system/system.nix | 1 + upstart-jobs/default.nix | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/system/options.nix b/system/options.nix index ed4fc3d0c78..645ca81cd07 100644 --- a/system/options.nix +++ b/system/options.nix @@ -376,7 +376,15 @@ default = false; description = " This option enables automatic loading of the firmware for the Intel - PRO/Wireless 3945ABG / 4965AGN. + PRO/Wireless 3945ABG. + "; + }; + + enableIntel4965AGNFirmware = mkOption { + default = false; + description = " + This option enables automatic loading of the firmware for the Intel + PRO/Wireless 4965AGN. "; }; diff --git a/system/system.nix b/system/system.nix index 3d4722cacb3..7aef99efe93 100644 --- a/system/system.nix +++ b/system/system.nix @@ -140,6 +140,7 @@ rec { modulesTree = pkgs.module_aggregation ( [kernel] ++ pkgs.lib.optional config.networking.enableIntel3945ABGFirmware pkgs.iwlwifi + ++ pkgs.lib.optional config.networking.enableIntel4965AGNFirmware pkgs.iwlwifi # !!! this should be declared by the xserver Upstart job. ++ pkgs.lib.optional (config.services.xserver.enable && config.services.xserver.videoDriver == "nvidia") pkgs.nvidiaDrivers ++ pkgs.lib.optional config.hardware.enableGo7007 pkgs.wis_go7007 diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix index 63779263f4e..d450f368638 100644 --- a/upstart-jobs/default.nix +++ b/upstart-jobs/default.nix @@ -28,6 +28,7 @@ let firmwareDirs = pkgs.lib.optional config.networking.enableIntel2200BGFirmware pkgs.ipw2200fw ++ pkgs.lib.optional config.networking.enableIntel3945ABGFirmware pkgs.iwlwifi3945ucode + ++ pkgs.lib.optional config.networking.enableIntel4965AGNFirmware pkgs.iwlwifi4965ucode ++ config.services.udev.addFirmware; extraUdevPkgs = pkgs.lib.optional config.services.hal.enable pkgs.hal