From cba02ddc3c814ec1f9b84337f7e05ddcbf6fa899 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 28 Sep 2011 23:38:39 +0000 Subject: aufs2: Only build if the kernel supports it svn path=/nixpkgs/trunk/; revision=29540 --- pkgs/top-level/all-packages.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'pkgs') 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; -- cgit v1.2.3