From 8ab38a2828f1ff411186aad39c816a0b5c0dfa8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 19 Mar 2011 20:44:45 +0000 Subject: [PATCH] Adding the fbcondecor patch for 2.6.37, by Shea Levy svn path=/nixpkgs/trunk/; revision=26428 --- pkgs/os-specific/linux/kernel/patches.nix | 11 +++++++++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 860dfaeef702..8c2942bfdfc5 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -101,6 +101,17 @@ in features.fbConDecor = true; }; + fbcondecor_2_6_37 = + rec { + name = "fbcondecor-0.9.6-2.6.37"; + patch = fetchurl { + url = "http://dev.gentoo.org/~spock/projects/fbcondecor/archive/${name}.patch"; + sha256 = "1yap9q6mp15jhsysry4x17cpm5dj35g8l2d0p0vn1xq25x3jfkqk"; + }; + 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 95e1ac97e3f0..ad22863b4ff7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5016,7 +5016,7 @@ let linux_2_6_37 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.37.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = - [ #kernelPatches.fbcondecor_2_6_35 + [ kernelPatches.fbcondecor_2_6_37 kernelPatches.sec_perm_2_6_24 #kernelPatches.aufs2_2_6_35 #kernelPatches.mips_restart_2_6_36