From f93620419fc4be3c34ba08649ed13100a3f572e3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 19 Jan 2010 18:28:48 +0000
Subject: [PATCH] * The Linux 2.6.32 headers contain a "scsi" subdirectory,
 which   clashes with Glibc's "scsi" subdirectory.

svn path=/nixpkgs/branches/stdenv-updates/; revision=19553
---
 pkgs/development/libraries/glibc-2.11/builder.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/glibc-2.11/builder.sh b/pkgs/development/libraries/glibc-2.11/builder.sh
index 57a44bd04ad..1e5dd6294ea 100644
--- a/pkgs/development/libraries/glibc-2.11/builder.sh
+++ b/pkgs/development/libraries/glibc-2.11/builder.sh
@@ -19,8 +19,12 @@ postInstall() {
     if test -n "$installLocales"; then
         make localedata/install-locales
     fi
+    
     test -f $out/etc/ld.so.cache && rm $out/etc/ld.so.cache
-    (cd $out/include && ln -s $kernelHeaders/include/* .) || exit 1
+
+    # Include the Linux kernel headers in Glibc, except the `scsi'
+    # subdirectory, which Glibc provides itself. 
+    (cd $out/include && ln -s $(ls -d $kernelHeaders/include/* | grep -v 'scsi$') .)
 
     # Fix for NIXOS-54 (ldd not working on x86_64).  Make a symlink
     # "lib64" to "lib".