diff options
author | Ludovic Courtès <ludo@gnu.org> | 2009-11-29 14:59:41 +0000 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2009-11-29 14:59:41 +0000 |
commit | 83f8715475b5bedf1516ed0728fcfa7dd40d9f22 (patch) | |
tree | 3e224a0c35ef7898618de94e9b47b23ddce1ac17 /pkgs/os-specific/linux/kernel-headers | |
parent | 641101c7fda853b04d6ded6d046012fc3468bd14 (diff) | |
download | nixlib-83f8715475b5bedf1516ed0728fcfa7dd40d9f22.tar nixlib-83f8715475b5bedf1516ed0728fcfa7dd40d9f22.tar.gz nixlib-83f8715475b5bedf1516ed0728fcfa7dd40d9f22.tar.bz2 nixlib-83f8715475b5bedf1516ed0728fcfa7dd40d9f22.tar.lz nixlib-83f8715475b5bedf1516ed0728fcfa7dd40d9f22.tar.xz nixlib-83f8715475b5bedf1516ed0728fcfa7dd40d9f22.tar.zst nixlib-83f8715475b5bedf1516ed0728fcfa7dd40d9f22.zip |
linux-headers-2.6.28: Verbosely apply the patch against `unifdef.c'.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18692
Diffstat (limited to 'pkgs/os-specific/linux/kernel-headers')
-rw-r--r-- | pkgs/os-specific/linux/kernel-headers/2.6.28.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.28.nix b/pkgs/os-specific/linux/kernel-headers/2.6.28.nix index fbda28587f04..525538f7bf32 100644 --- a/pkgs/os-specific/linux/kernel-headers/2.6.28.nix +++ b/pkgs/os-specific/linux/kernel-headers/2.6.28.nix @@ -4,11 +4,11 @@ assert stdenv.isLinux; let version = "2.6.28.5"; -in +in stdenv.mkDerivation { name = "linux-headers-${version}"; - + src = fetchurl { url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; sha256 = "0hifjh75sinifr5138v22zwbpqln6lhn65k8b57a1dyzlqca7cl9"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { targetConfig = if (cross != null) then cross.config else null; - platform = + platform = if cross != null then cross.arch else if stdenv.system == "i686-linux" then "i386" else if stdenv.system == "x86_64-linux" then "x86_64" else @@ -29,11 +29,11 @@ stdenv.mkDerivation { extraIncludeDirs = 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 []; patchPhase = '' - patch -p1 "${./unifdef-getline.patch}" + patch --verbose -p1 "${./unifdef-getline.patch}" sed -i '/scsi/d' include/Kbuild ''; @@ -57,6 +57,6 @@ stdenv.mkDerivation { ln -s asm $out/include/asm-$platform if test "$platform" = "i386" -o "$platform" = "x86_64"; then ln -s asm $out/include/asm-x86 - fi + fi ''; } |