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

Add meta.platforms to the Linux kernel expression.

Browse Source 
svn path=/nixpkgs/trunk/; revision=27722
This commit is contained in:
Ludovic Stordeur 2011-07-11 14:07:21 +00:00
parent 12f976e56e
commit 69dca5f4aa
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,7 +69,7 @@ stdenv.mkDerivation {
# 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;
}; };
builder = ./builder.sh; builder = ./builder.sh;
generateConfig = ./generate-config.pl; generateConfig = ./generate-config.pl;
@ -91,7 +91,7 @@ stdenv.mkDerivation {
kernelBaseConfig = stdenv.platform.kernelBaseConfig; kernelBaseConfig = stdenv.platform.kernelBaseConfig;
kernelTarget = stdenv.platform.kernelTarget; kernelTarget = stdenv.platform.kernelTarget;
autoModules = stdenv.platform.kernelAutoModules; autoModules = stdenv.platform.kernelAutoModules;
# Should we trust platform.kernelArch? We can only do # Should we trust platform.kernelArch? We can only do
# that once we differentiate i686/x86_64 in platforms. # that once we differentiate i686/x86_64 in platforms.
arch = arch =
@ -137,5 +137,6 @@ stdenv.mkDerivation {
license = "GPLv2"; license = "GPLv2";
homepage = http://www.kernel.org/; homepage = http://www.kernel.org/;
maintainers = [ lib.maintainers.eelco ]; maintainers = [ lib.maintainers.eelco ];
platforms = lib.platforms.linux;
} // extraMeta; } // extraMeta;
} }