Author: shlevy
Date: Fri Sep 30 15:37:35 2011
New Revision: 29547
URL: https://ssl.nixos.org/websvn/nix/?rev=29547&sc=1
Log:
Enable setting the headersSrc so the default kernel can be updated without
rebuilding stdenv
Modified:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/default.nix
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/generic.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/default.nix
Fri Sep 30 15:34:37 2011 (r29546)
+++
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/default.nix
Fri Sep 30 15:37:35 2011 (r29547)
@@ -13,7 +13,7 @@
stdenv.mkDerivation {
name = "linux-headers-${version}";
- src = kernel.src;
+ src = kernel.headersSrc;
targetConfig = if (cross != null) then cross.config else null;
Modified:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/generic.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/generic.nix
Fri Sep 30 15:34:37 2011 (r29546)
+++ nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/generic.nix
Fri Sep 30 15:37:35 2011 (r29547)
@@ -3,6 +3,9 @@
, # The kernel source tarball.
src
+, # The kernel headers source tarball.
+ headersSrc ? src
+
, # The kernel version.
version
@@ -69,7 +72,7 @@
enableParallelBuilding = true;
passthru = {
- inherit version modDirVersion;
+ inherit version modDirVersion headersSrc;
# 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;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
