From dedd972a16c94bdc179f33302a7b8603dd9fb547 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 18 Apr 2011 15:13:04 +0000 Subject: [PATCH] Add fbcondecor for 2.6.38 svn path=/nixpkgs/trunk/; revision=26876 --- 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 b500ee7d72d1..47154600aa0d 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -128,6 +128,17 @@ in features.fbConDecor = true; }; + fbcondecor_2_6_38 = + rec { + name = "fbcondecor-0.9.6-2.6.38"; + patch = fetchurl { + url = "http://dev.gentoo.org/~spock/projects/fbcondecor/archive/${name}.patch"; + sha256 = "1l8xqf5z227m5ay6azqba1qw10y26a4cwfhzzapzmmwq1bpr8mlw"; + }; + 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 78eba861e865..5e110a177539 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5166,7 +5166,7 @@ let linux_2_6_38 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.38.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = - [ #kernelPatches.fbcondecor_2_6_35 + [ kernelPatches.fbcondecor_2_6_38 kernelPatches.sec_perm_2_6_24 kernelPatches.aufs2_1_2_6_38 #kernelPatches.mips_restart_2_6_36