* 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

pkgs/games/ut2004demo/builder.sh

@@ -24,8 +24,6 @@ mkdir $out
 
 
 # Set the ELF interpreter to our own Glibc.
-glibc=$(cat $NIX_GCC/nix-support/orig-glibc)
-
 for i in "$out/System/ucc-bin" "$out/System/ut2004-bin"; do
-    patchelf --set-interpreter "$glibc/lib/ld-linux.so.2" "$i"
+    patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" "$i"
 done

pkgs/games/ut2004demo/make-wrapper.sh

@@ -2,8 +2,6 @@ source $stdenv/setup
 
 ensureDir $out/bin
 
-glibc=$(cat $NIX_GCC/nix-support/orig-glibc)
-
 cat > $out/bin/ut2004demo <<EOF
 #! $SHELL -e