From 6daa7866ca1bdc8724fba496da2f953d762f1718 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 28 May 2010 09:29:39 +0000 Subject: [PATCH] * Only build aufs2 for kernels that have the requisite base/standalone patch applied. svn path=/nixpkgs/trunk/; revision=22037 --- pkgs/os-specific/linux/aufs2/default.nix | 2 ++ pkgs/os-specific/linux/kernel/patches.nix | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/aufs2/default.nix b/pkgs/os-specific/linux/aufs2/default.nix index 86ccc7e30d54..0b10962b7f7c 100644 --- a/pkgs/os-specific/linux/aufs2/default.nix +++ b/pkgs/os-specific/linux/aufs2/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, kernel, perl }: +assert kernel.features ? aufsBase; + let version = "20100522"; in stdenv.mkDerivation { diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 9595fcb36c8e..abaa4857237a 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -143,6 +143,7 @@ in # standalone package. name = "aufs2"; patch = ./aufs2.patch; - }; - + features.aufsBase = true; + }; + }