Author: urkud
Date: Fri Aug 20 20:12:03 2010
New Revision: 23286
URL: https://svn.nixos.org/websvn/nix/?rev=23286&sc=1
Log:
Add fbcondecor-2.6.35
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 Fri Aug 20
20:09:22 2010 (r23285)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/patches.nix Fri Aug 20
20:12:03 2010 (r23286)
@@ -90,6 +90,17 @@
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";
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Aug 20 20:09:22
2010 (r23285)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Aug 20 20:12:03
2010 (r23286)
@@ -4537,7 +4537,7 @@
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
];
};
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
