From 0428a7405accf40fcb2afa5722cec4b920cd6433 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 15 Sep 2009 10:28:40 +0000
Subject: [PATCH] Fix aufs utilities for NixOS manual

svn path=/nixpkgs/trunk/; revision=17153
---
 pkgs/os-specific/linux/aufs2-utils/default.nix    | 3 ---
 pkgs/os-specific/linux/zen-kernel/2.6.31-zen0.nix | 1 +
 pkgs/top-level/all-packages.nix                   | 8 +++++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/aufs2-utils/default.nix b/pkgs/os-specific/linux/aufs2-utils/default.nix
index 052654752bf..ce2f2c1515a 100644
--- a/pkgs/os-specific/linux/aufs2-utils/default.nix
+++ b/pkgs/os-specific/linux/aufs2-utils/default.nix
@@ -1,6 +1,4 @@
 a :  
-if (a.lib.attrByPath ["features" "zen"] false a.kernel) ||
-  (a.lib.attrByPath ["features" "aufs"] false a.kernel) then
 let 
   s = import ./src-for-default.nix;
   buildInputs = with a; [
@@ -35,4 +33,3 @@ rec {
       linux;
   };
 }
-else throw "Kernel doesn't support AUFS"
diff --git a/pkgs/os-specific/linux/zen-kernel/2.6.31-zen0.nix b/pkgs/os-specific/linux/zen-kernel/2.6.31-zen0.nix
index 366ad7d6c74..80dfcaf6ab6 100644
--- a/pkgs/os-specific/linux/zen-kernel/2.6.31-zen0.nix
+++ b/pkgs/os-specific/linux/zen-kernel/2.6.31-zen0.nix
@@ -12,6 +12,7 @@ in
     iwlwifi = true;
     zen = true;
     fbConDecor = true;
+    aufs = true;
   };
 
   extraMeta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d3f47a1f982..43991ac9d8f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5357,9 +5357,11 @@ let
       inherit fetchgit stdenv kernel perl;
     };
 
-    aufs2Utils = builderDefsPackage ../os-specific/linux/aufs2-utils {
-      inherit kernel;
-    };
+    aufs2Utils = if kernel.features ? aufs then
+      builderDefsPackage ../os-specific/linux/aufs2-utils {
+        inherit kernel;
+      } 
+    else null;
 
     exmap = import ../os-specific/linux/exmap {
       inherit fetchurl stdenv kernel boost pcre pkgconfig;