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

Partially revert my recent kernelPackages changes

Browse Source 
First, pass in `self' again so that overriding works properly (thanks
for pointing that out, @edolstra)

Second, instead of having linuxPackages*.kernel mean something different
inside the set and out, add a new attribute linuxPackages*.kernelDev,
which for the generic kernel is simply linuxPackages*.kernel but for the
manual-config kernel is the `dev' output (which has the build tree,
source tree, etc.)

The second change required trivial modifications in a bunch of
expressions, I verified that all of the linuxPackages* sets defined in
all-packages.nix have the same drv paths before and after the change.

Signed-off-by: Shea Levy <shea@shealevy.com>
This commit is contained in:
Shea Levy
2013-03-24 07:45:00 -04:00
parent f8fb55b4cc
commit 4fa4ab3a6e
34 changed files with 228 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/os-specific/linux/e1000e/default.nix
View File

@@ -1,19 +1,19 @@
{ stdenv, fetchurl, kernel }:
{ stdenv, fetchurl, kernelDev }:
stdenv.mkDerivation {
name = "e1000e-1.5.1-${kernel.version}";
name = "e1000e-1.5.1-${kernelDev.version}";
src = fetchurl {
url = "http://downloads.sourceforge.net/e1000/e1000e-1.5.1.tar.gz";
sha256 = "0nzjlarpqcpm5y112n3vzra4qv32hiygpfkk10y8g4nln4adhqsw";
};
buildInputs = [ kernel ];
buildInputs = [ kernelDev ];
configurePhase = ''
cd src
kernel_version=$( cd ${kernel}/lib/modules && echo * )
sed -i -e 's|/lib/modules|${kernel}/lib/modules|' Makefile
kernel_version=$( cd ${kernelDev}/lib/modules && echo * )
sed -i -e 's|/lib/modules|${kernelDev}/lib/modules|' Makefile
export makeFlags="BUILD_KERNEL=$kernel_version"
'';