diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-03-16 12:45:27 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-03-16 12:45:27 +0000 |
| commit | 3593b97d631d554cfec9a5eec8966fadb3192de8 (patch) | |
| tree | c1a1f0bbb9270c83c803f501e14ea451e8f9fc74 /pkgs/os-specific/linux/kernel-headers | |
| parent | d574d882ccade3b159b16e7ea2b8aeffd9d13bcd (diff) | |
| parent | 808f12e36961b15c9662bb6e890f9045cdab43ce (diff) | |
| download | nixlib-3593b97d631d554cfec9a5eec8966fadb3192de8.tar nixlib-3593b97d631d554cfec9a5eec8966fadb3192de8.tar.gz nixlib-3593b97d631d554cfec9a5eec8966fadb3192de8.tar.bz2 nixlib-3593b97d631d554cfec9a5eec8966fadb3192de8.tar.lz nixlib-3593b97d631d554cfec9a5eec8966fadb3192de8.tar.xz nixlib-3593b97d631d554cfec9a5eec8966fadb3192de8.tar.zst nixlib-3593b97d631d554cfec9a5eec8966fadb3192de8.zip | |
* Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14557
Diffstat (limited to 'pkgs/os-specific/linux/kernel-headers')
| -rw-r--r-- | pkgs/os-specific/linux/kernel-headers/2.6.28.nix | 11 |
1 files changed, 8 insertions, 3 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 082a65950ca8..3136f52db8e8 100644 --- 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 + ''; } |