From 31f2316454e7efb083281ac59f7b6bc600ba926b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 25 Oct 2006 10:55:36 +0000
Subject: [PATCH] * "ppc" -> "powerpc", but do copy the "ppc" directory as
 well.

svn path=/nixpkgs/trunk/; revision=6844
---
 pkgs/os-specific/linux/kernel-headers/builder.sh  | 3 +++
 pkgs/os-specific/linux/kernel-headers/default.nix | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel-headers/builder.sh b/pkgs/os-specific/linux/kernel-headers/builder.sh
index efab999fe3b2..b2ebbc694853 100644
--- a/pkgs/os-specific/linux/kernel-headers/builder.sh
+++ b/pkgs/os-specific/linux/kernel-headers/builder.sh
@@ -14,6 +14,9 @@ installPhase() {
     cp -prvd include/linux include/asm-generic $out/include
     cp -prvd include/asm-$platform $out/include
     ln -s asm-$platform $out/include/asm
+    for i in $extraIncludeDirs; do
+	cp -prvd include/asm-$i $out/include
+    done
     echo -n > $out/include/linux/autoconf.h
 }
 
diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index 944ec2a21cba..baa225f50513 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -13,6 +13,9 @@ stdenv.mkDerivation {
   platform = 
     if stdenv.system == "i686-linux" then "i386" else
     if stdenv.system == "x86_64-linux" then "x86_64" else
-    if stdenv.system == "powerpc-linux" then "ppc" else
+    if stdenv.system == "powerpc-linux" then "powerpc" else
     abort "don't know what the kernel include directory is called for this platform";
+
+  extraIncludeDirs =
+    if stdenv.system == "powerpc-linux" then ["ppc"] else [];
 }