From f6a55ce2ff5b3d7c9fabfe130a22c3f908c891ec Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 12 Aug 2008 18:10:11 +0000
Subject: [PATCH] * Don't build iwlwifi for Linux 2.6.{25,26}.

svn path=/nixpkgs/trunk/; revision=12604
---
 pkgs/top-level/build-for-release.nix | 34 ++++++++++++++++++----------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix
index 37e1747df86..817f3ea7306 100644
--- a/pkgs/top-level/build-for-release.nix
+++ b/pkgs/top-level/build-for-release.nix
@@ -206,18 +206,28 @@ let
       gnomeutils
       metacity
       ;
-    kernelPackages_2_6_23 = kernelPackagesSubset pkgs pkgs.kernelPackages_2_6_23;
-    kernelPackages_2_6_25 = kernelPackagesSubset pkgs pkgs.kernelPackages_2_6_25;
-    kernelPackages_2_6_26 = kernelPackagesSubset pkgs pkgs.kernelPackages_2_6_26;
-  };
-
-  kernelPackagesSubset = pkgs: kernelPackages: pkgs.recurseIntoAttrs {
-    inherit (kernelPackages)
-      iwlwifi
-      kernel
-      klibc
-      splashutils
-      ;
+    kernelPackages_2_6_23 = {
+      inherit (pkgs.kernelPackages_2_6_23)
+        iwlwifi
+        kernel
+        klibc
+        splashutils
+        ;
+    };
+    kernelPackages_2_6_25 = {
+      inherit (pkgs.kernelPackages_2_6_25)
+        kernel
+        klibc
+        splashutils
+        ;
+    };
+    kernelPackages_2_6_26 = {
+      inherit (pkgs.kernelPackages_2_6_26)
+        kernel
+        klibc
+        splashutils
+        ;
+    };
   };
 
   i686LinuxPkgs = commonLinuxPkgs "i686-linux" // {