public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux-3.10: fix build by upstream patch

Browse Source
This commit is contained in:
Graham Christensen 2016-09-28 18:45:55 +02:00 committed by Vladimír Čunát
parent 7c7e88b45e
commit ff5cf3abff
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/os-specific/linux/kernel/patches.nix
View File

@ -139,4 +139,13 @@ rec {
}; };
cpu-cgroup-v2 = import ./cpu-cgroup-v2-patches; cpu-cgroup-v2 = import ./cpu-cgroup-v2-patches;
lguest_entry-linkage =
{ name = "lguest-asmlinkage.patch";
patch = fetchpatch {
url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git"
+ "/patch/drivers/lguest/x86/core.c?id=cdd77e87eae52";
sha256 = "04xlx6al10cw039av6jkby7gx64zayj8m1k9iza40sw0fydcfqhc";
};
};
} }

2
pkgs/top-level/all-packages.nix
View File

@ -10674,7 +10674,7 @@ in
}; };
linux_3_10 = callPackage ../os-specific/linux/kernel/linux-3.10.nix { linux_3_10 = callPackage ../os-specific/linux/kernel/linux-3.10.nix {
kernelPatches = with kernelPatches; [ bridge_stp_helper ] kernelPatches = with kernelPatches; [ bridge_stp_helper lguest_entry-linkage ]
++ lib.optionals ((platform.kernelArch or null) == "mips") ++ lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu [ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill kernelPatches.mips_fpu_sigill