about summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorArmijn Hemel <armijn@gpl-violations.org>2006-08-29 17:48:04 +0000
committerArmijn Hemel <armijn@gpl-violations.org>2006-08-29 17:48:04 +0000
commit58f89a887711d08b61e4836cb32e10f7915e6ab8 (patch)
tree39ca3d14cbd2135a15dbcbd359a403bc5556792b /pkgs/os-specific
parentc2f53451722811dafb841f3d189ce4ce80e6cd35 (diff)
change kernel-headers. Now we can build this on powerpc-linux too...
svn path=/nixpkgs/trunk/; revision=6310
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/kernel-headers/builder.sh12
-rw-r--r--pkgs/os-specific/linux/kernel-headers/kernel-headers-2.6.14.3.nix4
-rw-r--r--pkgs/os-specific/linux/kernel-headers/kernel-headers-2.6.17.6.nix4
3 files changed, 13 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/kernel-headers/builder.sh b/pkgs/os-specific/linux/kernel-headers/builder.sh
index f4920edd355c2..da349125da89e 100644
--- a/pkgs/os-specific/linux/kernel-headers/builder.sh
+++ b/pkgs/os-specific/linux/kernel-headers/builder.sh
@@ -11,9 +11,15 @@ buildPhase=buildPhase
 installPhase() {
     mkdir $out
     mkdir $out/include
-    cp -prvd include/linux include/asm-i386 include/asm-generic $out/include
-    cd $out/include
-    ln -s asm-i386 asm
+    if test $system = "i686-linux"; then
+        cp -prvd include/linux include/asm-i386 include/asm-generic $out/include
+        cd $out/include
+        ln -s asm-i386 asm
+    elif test $system = "powerpc-linux"; then
+        cp -prvd include/linux include/asm-ppc include/asm-generic $out/include
+        cd $out/include
+        ln -s asm-ppc asm
+    fi
     echo -n > $out/include/linux/autoconf.h
 }
 
diff --git a/pkgs/os-specific/linux/kernel-headers/kernel-headers-2.6.14.3.nix b/pkgs/os-specific/linux/kernel-headers/kernel-headers-2.6.14.3.nix
index 9d311201a1933..f1b21e712ca34 100644
--- a/pkgs/os-specific/linux/kernel-headers/kernel-headers-2.6.14.3.nix
+++ b/pkgs/os-specific/linux/kernel-headers/kernel-headers-2.6.14.3.nix
@@ -1,9 +1,9 @@
 {stdenv, fetchurl}:
 
-assert stdenv.system == "i686-linux";
+assert stdenv.isLinux;
 
 stdenv.mkDerivation {
-  name = "linux-headers-2.6.14.3-i386";
+  name = "linux-headers-2.6.14.3";
   builder = ./builder.sh;
   src = fetchurl {
     url = http://nix.cs.uu.nl/dist/tarballs/linux-2.6.14.3.tar.bz2;
diff --git a/pkgs/os-specific/linux/kernel-headers/kernel-headers-2.6.17.6.nix b/pkgs/os-specific/linux/kernel-headers/kernel-headers-2.6.17.6.nix
index a8ff480e101f5..33c55c02858a7 100644
--- a/pkgs/os-specific/linux/kernel-headers/kernel-headers-2.6.17.6.nix
+++ b/pkgs/os-specific/linux/kernel-headers/kernel-headers-2.6.17.6.nix
@@ -1,9 +1,9 @@
 {stdenv, fetchurl}:
 
-assert stdenv.system == "i686-linux";
+assert stdenv.isLinux;
 
 stdenv.mkDerivation {
-  name = "linux-headers-2.6.17.6-i386";
+  name = "linux-headers-2.6.17.6";
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.nluug.nl/pub/os/Linux/system/kernel/v2.6/linux-2.6.17.6.tar.bz2;