diff options
| author | Eelco Dolstra | 2010-05-28 09:29:39 +0000 |
|---|---|---|
| committer | Eelco Dolstra | 2010-05-28 09:29:39 +0000 |
| commit | 6daa7866ca1bdc8724fba496da2f953d762f1718 (patch) | |
| tree | 1b60f852dd0ff0b03f92d80921bbeee53f0810d9 /pkgs/os-specific | |
| parent | dbf8d72080b4718f1d2cec787b4721f0d6869064 (diff) | |
* Only build aufs2 for kernels that have the requisite base/standalone
patch applied. svn path=/nixpkgs/trunk/; revision=22037
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/aufs2/default.nix | 2 | ||||
| -rw-r--r-- | 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; + }; + } |