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

linux-headers-2.6.28: Verbosely apply the patch against `unifdef.c'.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18692
This commit is contained in:
Ludovic Courtès 2009-11-29 14:59:41 +00:00
parent 641101c7fd
commit 83f8715475
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/os-specific/linux/kernel-headers/2.6.28.nix
View File

@ -4,11 +4,11 @@ assert stdenv.isLinux;
let let
version = "2.6.28.5"; version = "2.6.28.5";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "linux-headers-${version}"; name = "linux-headers-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
sha256 = "0hifjh75sinifr5138v22zwbpqln6lhn65k8b57a1dyzlqca7cl9"; sha256 = "0hifjh75sinifr5138v22zwbpqln6lhn65k8b57a1dyzlqca7cl9";
@ -16,7 +16,7 @@ stdenv.mkDerivation {
targetConfig = if (cross != null) then cross.config else null; targetConfig = if (cross != null) then cross.config else null;
platform = platform =
if cross != null then cross.arch else if cross != null then cross.arch else
if stdenv.system == "i686-linux" then "i386" else if stdenv.system == "i686-linux" then "i386" else
if stdenv.system == "x86_64-linux" then "x86_64" else if stdenv.system == "x86_64-linux" then "x86_64" else
@ -29,11 +29,11 @@ stdenv.mkDerivation {
extraIncludeDirs = extraIncludeDirs =
if cross != null then if cross != null then
(if cross.arch == "powerpc" then ["ppc"] else []) (if cross.arch == "powerpc" then ["ppc"] else [])
else if stdenv.system == "powerpc-linux" then ["ppc"] else []; else if stdenv.system == "powerpc-linux" then ["ppc"] else [];
patchPhase = '' patchPhase = ''
patch -p1 "${./unifdef-getline.patch}" patch --verbose -p1 "${./unifdef-getline.patch}"
sed -i '/scsi/d' include/Kbuild sed -i '/scsi/d' include/Kbuild
''; '';
@ -57,6 +57,6 @@ stdenv.mkDerivation {
ln -s asm $out/include/asm-$platform ln -s asm $out/include/asm-$platform
if test "$platform" = "i386" -o "$platform" = "x86_64"; then if test "$platform" = "i386" -o "$platform" = "x86_64"; then
ln -s asm $out/include/asm-x86 ln -s asm $out/include/asm-x86
fi fi
''; '';
} }