dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Enable setting the headersSrc so the default kernel can be updated without rebuilding stdenv

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29547
This commit is contained in:
Shea Levy 2011-09-30 15:37:35 +00:00
parent dcef7ad3bf
commit c10d43d3bd
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/kernel-headers/default.nix
View File

@ -13,7 +13,7 @@ in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "linux-headers-${version}"; name = "linux-headers-${version}";
src = kernel.src; src = kernel.headersSrc;
targetConfig = if (cross != null) then cross.config else null; targetConfig = if (cross != null) then cross.config else null;

5
pkgs/os-specific/linux/kernel/generic.nix
View File

@ -3,6 +3,9 @@
, # The kernel source tarball. , # The kernel source tarball.
src src
, # The kernel headers source tarball.
headersSrc ? src
, # The kernel version. , # The kernel version.
version version
@ -69,7 +72,7 @@ stdenv.mkDerivation {
enableParallelBuilding = true; enableParallelBuilding = true;
passthru = { passthru = {
inherit version modDirVersion; inherit version modDirVersion headersSrc;
# Combine the `features' attribute sets of all the kernel patches. # Combine the `features' attribute sets of all the kernel patches.
features = lib.fold (x: y: (if x ? features then x.features else {}) // y) features kernelPatches; features = lib.fold (x: y: (if x ? features then x.features else {}) // y) features kernelPatches;
}; };