about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMathijs Kwik <mathijs@bluescreen303.nl>2012-06-11 17:41:11 +0000
committerMathijs Kwik <mathijs@bluescreen303.nl>2012-06-11 17:41:11 +0000
commit3d4ab75229d8b83c6e05733f6aaba597b9de3b7e (patch)
treed4df35f13e2b79e7af5bd526e722484712ac7e01
parent46beccef20a8aaa23c2c1ebb3a099e23186aaf65 (diff)
downloadnixlib-3d4ab75229d8b83c6e05733f6aaba597b9de3b7e.tar
nixlib-3d4ab75229d8b83c6e05733f6aaba597b9de3b7e.tar.gz
nixlib-3d4ab75229d8b83c6e05733f6aaba597b9de3b7e.tar.bz2
nixlib-3d4ab75229d8b83c6e05733f6aaba597b9de3b7e.tar.lz
nixlib-3d4ab75229d8b83c6e05733f6aaba597b9de3b7e.tar.xz
nixlib-3d4ab75229d8b83c6e05733f6aaba597b9de3b7e.tar.zst
nixlib-3d4ab75229d8b83c6e05733f6aaba597b9de3b7e.zip
linux kernel headers: copy generated headers as well
as they are referenced from other kernel headers, this seems like the
best thing to do. Ubuntu seems to do so too.

Fixes issues with nvidia's binary driver and bbswitch on kernels > 3.3

svn path=/nixpkgs/trunk/; revision=34469
-rw-r--r--pkgs/os-specific/linux/kernel/builder.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh
index 5d6d48d2fc3d..4c095bf8bbc9 100644
--- a/pkgs/os-specific/linux/kernel/builder.sh
+++ b/pkgs/os-specific/linux/kernel/builder.sh
@@ -138,6 +138,7 @@ installPhase() {
             (cd include && cp -a * $includeDir)
         (cd arch/$archDir/include && cp -a * $includeDir || true)
         (cd arch/$archDir/include && cp -a asm/* $includeDir/asm/ || true)
+        (cd arch/$archDir/include && cp -a generated/asm/* $includeDir/asm/ || true)
         (cd arch/$archDir/include/asm/mach-generic && cp -a * $includeDir/ || true)
         fi
     fi