diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-10-25 10:55:36 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-10-25 10:55:36 +0000 |
commit | 31f2316454e7efb083281ac59f7b6bc600ba926b (patch) | |
tree | ce6fb7c13368d276c6f3d39e3d8533c37d8d11f2 /pkgs/os-specific | |
parent | 26a11fbf545c27ded5335aefdb6ed8a4c7db8342 (diff) |
* "ppc" -> "powerpc", but do copy the "ppc" directory as well.
svn path=/nixpkgs/trunk/; revision=6844
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/kernel-headers/builder.sh | 3 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel-headers/default.nix | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel-headers/builder.sh b/pkgs/os-specific/linux/kernel-headers/builder.sh index efab999fe3b2e..b2ebbc6948533 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 944ec2a21cbae..baa225f505130 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 []; } |