Author: shlevy
Date: Mon Apr 18 15:13:04 2011
New Revision: 26876
URL: https://svn.nixos.org/websvn/nix/?rev=26876&sc=1

Log:
Add fbcondecor for 2.6.38

Modified:
   nixpkgs/trunk/pkgs/os-specific/linux/kernel/patches.nix
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/patches.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/patches.nix     Mon Apr 18 
08:21:27 2011        (r26875)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/patches.nix     Mon Apr 18 
15:13:04 2011        (r26876)
@@ -128,6 +128,17 @@
       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";

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix       Mon Apr 18 08:21:27 
2011        (r26875)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix       Mon Apr 18 15:13:04 
2011        (r26876)
@@ -5166,7 +5166,7 @@
   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
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to