diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 3811ce324d62..fafb38cae0be 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -209,6 +209,7 @@ in name = "aufs2.1"; patch = ./aufs2.1-37.patch; features.aufsBase = true; + features.aufs2_1 = true; }; # Increase the timeout on CIFS requests from 15 to 120 seconds to diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5096c50e772..654a735bbc91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5117,12 +5117,16 @@ let aufs2 = callPackage ../os-specific/linux/aufs2 { }; - aufs2_1 = callPackage ../os-specific/linux/aufs2.1 { }; + aufs2_1 = if kernel.features ? aufs2_1 then + callPackage ../os-specific/linux/aufs2.1 { } + 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 { }; - aufs2_1_util = callPackage ../os-specific/linux/aufs2.1-util { }; - blcr = callPackage ../os-specific/linux/blcr { #libtool = libtool_1_5; # libtool 2 causes a fork bomb };