* Sync with the trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14557
2009-03-16 12:45:27 +00:00
parent d574d882cc 808f12e369
commit 3593b97d63
339 changed files with 4943 additions and 2370 deletions
--- a/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
+++ b/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
@@ -20,9 +20,6 @@ stdenv.mkDerivation {

  buildInputs = [perl];

-  # !!! hacky
-  fixupPhase = "ln -s $out/include/asm $out/include/asm-$platform";
-
  extraIncludeDirs =
    if stdenv.system == "powerpc-linux" then ["ppc"] else [];

@@ -41,4 +38,12 @@ stdenv.mkDerivation {
    ensureDir $out/include/config
    echo "${version}-default" > $out/include/config/kernel.release
  '';
+
+  # !!! hacky
+  fixupPhase = ''
+    ln -s asm $out/include/asm-$platform
+    if test "$platform" = "i386" -o "$platform" = "x86_64"; then
+      ln -s asm $out/include/asm-x86
+    fi  
+  '';
 }