summaryrefslogtreecommitdiffstats
path: root/pkgs
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2011-09-28 23:38:39 +0000
committerShea Levy <shea@shealevy.com>2011-09-28 23:38:39 +0000
commitcba02ddc3c814ec1f9b84337f7e05ddcbf6fa899 (patch)
treefa7301c2567937c71e25923af418f94b55dbca9d /pkgs
parent107e39b2142c487b6d3f1dc647ea384442ee98b6 (diff)
aufs2: Only build if the kernel supports it
svn path=/nixpkgs/trunk/; revision=29540
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/top-level/all-packages.nix10
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 128daf26d168..9c7e4435e132 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5582,7 +5582,9 @@ let
aufs = callPackage ../os-specific/linux/aufs { };
- aufs2 = callPackage ../os-specific/linux/aufs2 { };
+ aufs2 = if kernel.features ? aufs2 then
+ callPackage ../os-specific/linux/aufs2 { }
+ else null;
aufs2_1 = if kernel.features ? aufs2_1 then
callPackage ../os-specific/linux/aufs2.1 { }
@@ -5592,12 +5594,14 @@ let
callPackage ../os-specific/linux/aufs3 { }
else null;
+ aufs2_util = if kernel.features ? aufs2 then
+ callPackage ../os-specific/linux/aufs2-util { }
+ else null;
+
aufs2_1_util = if kernel.features ? aufs2_1 then
callPackage ../os-specific/linux/aufs2.1-util { }
else null;
- aufs2_util = callPackage ../os-specific/linux/aufs2-util { };
-
aufs3_util = if kernel.features ? aufs3 then
callPackage ../os-specific/linux/aufs3-util { }
else null;