diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index b0c4c210070..f1ac2a37895 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -80,6 +80,16 @@ in features.fbConDecor = true; }; + fbcondecor_2_6_33 = + { name = "fbcondecor-0.9.6-2.6.33-rc7"; + patch = fetchurl { + url = http://dev.gentoo.org/~spock/projects/fbcondecor/archive/fbcondecor-0.9.6-2.6.33-rc7.patch; + sha256 = "1v9lg3bgva0xry0s09drpw3n139s8hln8slayaf6i26vg4l4xdz6"; + }; + extraConfig = fbcondecorConfig; + features.fbConDecor = true; + }; + # From http://patchwork.kernel.org/patch/19495/ ext4_softlockups_2_6_28 = { name = "ext4-softlockups-fix"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 188893097e4..d4ec90bfae1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5927,7 +5927,7 @@ let linux_2_6_33 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.33.nix) { inherit fetchurl stdenv perl mktemp module_init_tools; kernelPatches = - [ kernelPatches.fbcondecor_2_6_31 + [ kernelPatches.fbcondecor_2_6_33 kernelPatches.sec_perm_2_6_24 ]; inherit platform;