* Renamed orig-glibc -> orig-libc in some places, and in others, use

  the new $NIX_GCC/nix-support/dynamic-linker file to locate the
  dynamic linker directly (don't hardcode ld-linux.so.2).

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

7 files changed, 7 insertions, 13 deletions

diff --git a/pkgs/applications/editors/eclipse/builder.sh b/pkgs/applications/editors/eclipse/builder.sh
index d781b585783e..8d693b025ffc 100755
--- a/pkgs/applications/editors/eclipse/builder.sh
+++ b/pkgs/applications/editors/eclipse/builder.sh
@@ -18,10 +18,9 @@ rpath=
 for i in $libraries; do
     rpath=$rpath${rpath:+:}$i/lib
 done
-glibc=$(cat $NIX_GCC/nix-support/orig-glibc)
 find $out \( -type f -a -perm +0100 \) \
     -print \
-    -exec patchelf --interpreter $glibc/lib/ld-linux.so.* \
+    -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
     --set-rpath "$rpath" {} \;
 #find $out \( -type f -a -name "*.so*" \) \
 #    -print \
diff --git a/pkgs/applications/editors/emacs-22-aa/builder.sh b/pkgs/applications/editors/emacs-22-aa/builder.sh
index a59f4d45f4a7..e9c909739d53 100644
--- a/pkgs/applications/editors/emacs-22-aa/builder.sh
+++ b/pkgs/applications/editors/emacs-22-aa/builder.sh
@@ -1,6 +1,6 @@
 source $stdenv/setup
 
-myglibc=`cat ${NIX_GCC}/nix-support/orig-glibc`
+myglibc=`cat ${NIX_GCC}/nix-support/orig-libc`
 echo "glibc: $myglibc" 
 
 postConfigure() {
diff --git a/pkgs/applications/editors/emacs-22/builder.sh b/pkgs/applications/editors/emacs-22/builder.sh
index a59f4d45f4a7..e9c909739d53 100644
--- a/pkgs/applications/editors/emacs-22/builder.sh
+++ b/pkgs/applications/editors/emacs-22/builder.sh
@@ -1,6 +1,6 @@
 source $stdenv/setup
 
-myglibc=`cat ${NIX_GCC}/nix-support/orig-glibc`
+myglibc=`cat ${NIX_GCC}/nix-support/orig-libc`
 echo "glibc: $myglibc" 
 
 postConfigure() {
diff --git a/pkgs/applications/editors/emacs/builder.sh b/pkgs/applications/editors/emacs/builder.sh
index a59f4d45f4a7..e9c909739d53 100644
--- a/pkgs/applications/editors/emacs/builder.sh
+++ b/pkgs/applications/editors/emacs/builder.sh
@@ -1,6 +1,6 @@
 source $stdenv/setup
 
-myglibc=`cat ${NIX_GCC}/nix-support/orig-glibc`
+myglibc=`cat ${NIX_GCC}/nix-support/orig-libc`
 echo "glibc: $myglibc" 
 
 postConfigure() {
diff --git a/pkgs/applications/misc/acrobat-reader/builder.sh b/pkgs/applications/misc/acrobat-reader/builder.sh
index 0add42a85959..d37919858f72 100644
--- a/pkgs/applications/misc/acrobat-reader/builder.sh
+++ b/pkgs/applications/misc/acrobat-reader/builder.sh
@@ -17,13 +17,11 @@ if test -n "$fastStart"; then
     rm -v $(ls $out/Reader/intellinux/plug_ins/*.api | grep -v SearchFind)
 fi
 
-glibc=$(cat $NIX_GCC/nix-support/orig-glibc)
-
 fullPath=
 for i in $libPath; do
     fullPath=$fullPath${fullPath:+:}$i/lib
 done
 
-patchelf --interpreter $glibc/lib/ld-linux.so.* \
+patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
     --set-rpath $fullPath \
     $out/Reader/intellinux/bin/acroread
diff --git a/pkgs/applications/networking/browsers/opera/builder.sh b/pkgs/applications/networking/browsers/opera/builder.sh
index a0dadf07a9d9..59c0bf2cb606 100644
--- a/pkgs/applications/networking/browsers/opera/builder.sh
+++ b/pkgs/applications/networking/browsers/opera/builder.sh
@@ -11,8 +11,6 @@ installPhase() {
     # want to install icons in some system-wide directories.
     echo no | ./install.sh --prefix=$out
 
-    glibc=$(cat $NIX_GCC/nix-support/orig-glibc)
-
     rpath=/no-such-path
     for i in $libPath; do
         rpath="$rpath:$i/lib"
@@ -24,7 +22,7 @@ installPhase() {
     
     for i in $out/lib/opera/*/opera $out/lib/opera/plugins/opera*; do
         patchelf \
-            --set-interpreter "$glibc/lib/ld-linux.so.2" \
+            --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
             --set-rpath "$rpath" \
             "$i"
     done
diff --git a/pkgs/applications/video/RealPlayer/builder.sh b/pkgs/applications/video/RealPlayer/builder.sh
index 45892653b65b..298054916317 100644
--- a/pkgs/applications/video/RealPlayer/builder.sh
+++ b/pkgs/applications/video/RealPlayer/builder.sh
@@ -9,8 +9,7 @@ skip=143273 # Look for "BZh91" in the executable.
 
 rm -rf $out/real/Bin $out/real/postinst
 
-glibc=$(cat $NIX_GCC/nix-support/orig-glibc)
-patchelf --interpreter $glibc/lib/ld-linux.so.* $out/real/realplay.bin
+patchelf --interpreter $(cat $NIX_GCC/nix-support/dynamic-linker) $out/real/realplay.bin
 
 ensureDir $out/bin
 makeWrapper "$out/real/realplay.bin" "$out/bin/realplay" \