* Don't patch symlinked shared libraries.

svn path=/nixpkgs/trunk/; revision=3195

pkgs/stdenv/generic/setup.sh

@@ -535,8 +535,9 @@ checkPhase() {
 
 patchELF() {
     # Patch all ELF executables and shared libraries.
-    header "patching ELF executables and libraries"
-    find "$prefix" \( -name "*.so*" -o \
+    header "patching ELF executables and libraries (BLA)"
+    find "$prefix" \( \
+        \( -type f -a -name "*.so*" \) -o \
         \( -type f -a -perm +0100 \) \
         \) -exec patchelf --shrink-rpath {} \;
     stopNest

pkgs/tools/compression/bzip2/builder.sh

@@ -6,16 +6,6 @@ preBuild() {
     make -f Makefile-libbz2_so
 }
 
-patchELF() {
-    # Patch all ELF executables and shared libraries.
-    header "patching ELF executables and libraries (BLA)"
-    find "$prefix" \( \
-        \( -type f -a -name "*.so*" \) -o \
-        \( -type f -a -perm +0100 \) \
-        \) -exec patchelf --shrink-rpath {} \;
-    stopNest
-}
-
 preInstall=preInstall
 preInstall() {
     ensureDir $out/lib