diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 4019348375a8..cf68699ceef7 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -90,6 +90,17 @@ in features.fbConDecor = true; }; + fbcondecor_2_6_35 = + rec { + name = "fbcondecor-0.9.6-2.6.35-rc4"; + patch = fetchurl { + url = "http://dev.gentoo.org/~spock/projects/fbcondecor/archive/${name}.patch"; + sha256 = "0dlks1arr3b3hlmw9k1a1swji2x655why61sa0aahm62faibsg1r"; + }; + 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 4f4e77601801..d71653058700 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4537,7 +4537,7 @@ let linux_2_6_35 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.35.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = - [ /*kernelPatches.fbcondecor_2_6_33*/ + [ kernelPatches.fbcondecor_2_6_35 kernelPatches.sec_perm_2_6_24 ]; };