diff --git a/pkgs/build-support/gcc-wrapper/ld-wrapper.sh b/pkgs/build-support/gcc-wrapper/ld-wrapper.sh
index 962adf43861a..52aa57bc1ea7 100644
--- a/pkgs/build-support/gcc-wrapper/ld-wrapper.sh
+++ b/pkgs/build-support/gcc-wrapper/ld-wrapper.sh
@@ -81,6 +81,9 @@ if test "$NIX_DONT_SET_RPATH" != "1"; then
         elif test "$p" = "-L"; then
             addToLibPath ${p2}
             n=$((n + 1))
+        elif $(echo "$p" | grep -q '\.so\($\|\.\)'); then
+            path="$(dirname "$p")";
+            addToLibPath "${path}"
         fi
         n=$((n + 1))
     done
@@ -113,6 +116,12 @@ if test "$NIX_DONT_SET_RPATH" != "1"; then
                 # I haven't seen `-l foo', but you never know...
                 addToRPath $i
                 break
+            elif $(echo "$p" | grep -q '\.so\($\|\.\)'); then
+                path="$(dirname "$p")";
+                if test "$path" == "$i"; then
+                  addToRPath $i
+                  break;
+                fi
             fi
             n=$((n + 1))
         done
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5e32a37dd322..504b7fc8255f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1807,7 +1807,6 @@ let
   });
 
   gcc44 = useFromStdenv "gcc" gcc44_real;
-  gcc44_wrapper2 = wrapGCC2 gcc44.gcc;
 
   gcc43 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc-4.3) {
     inherit stdenv fetchurl texinfo gmp mpfr noSysDirs;
@@ -2283,7 +2282,6 @@ let
   };
 
   wrapGCC = wrapGCCWith (import ../build-support/gcc-wrapper) glibc;
-  wrapGCC2 = wrapGCCWith (import ../build-support/gcc-wrapper2) glibc;
 
   wrapGCCCross =
     {gcc, libc, binutils, cross, shell ? "", name ? "gcc-cross-wrapper"}:
@@ -4357,8 +4355,7 @@ let
   };
 
   openal = import ../development/libraries/openal {
-    inherit fetchurl cmake alsaLib;
-    stdenv = overrideGCC stdenv gcc43_wrapper2;
+    inherit fetchurl stdenv cmake alsaLib;
   };
 
   # added because I hope that it has been easier to compile on x86 (for blender)
@@ -6387,14 +6384,12 @@ let
   };
 
   autopanosiftc = import ../applications/graphics/autopanosiftc {
-    inherit fetchurl cmake libpng libtiff libjpeg panotools libxml2;
-    stdenv = overrideGCC stdenv gcc43_wrapper2;
+    inherit fetchurl stdenv cmake libpng libtiff libjpeg panotools libxml2;
   };
 
   avidemux = import ../applications/video/avidemux {
-    inherit fetchurl cmake pkgconfig libxml2 qt4 gettext SDL libxslt x264
+    inherit fetchurl stdenv cmake pkgconfig libxml2 qt4 gettext SDL libxslt x264
       alsaLib lame faac faad2 libvorbis;
-    stdenv = overrideGCC stdenv gcc43_wrapper2;
     inherit (gtkLibs) gtk;
     inherit (xlibs) libXv pixman libpthreadstubs libXau libXdmcp;
   };
@@ -6925,8 +6920,7 @@ let
   };
 
   freepv = import ../applications/graphics/freepv {
-    inherit fetchurl mesa freeglut libjpeg zlib cmake libxml2 libpng;
-    stdenv = overrideGCC stdenv gcc43_wrapper2;
+    inherit fetchurl stdenv mesa freeglut libjpeg zlib cmake libxml2 libpng;
     inherit (xlibs) libX11 libXxf86vm;
   };
 
@@ -7076,11 +7070,10 @@ let
   };
 
   hugin = import ../applications/graphics/hugin {
-    inherit fetchurl cmake panotools libtiff libpng boost pkgconfig
+    inherit fetchurl stdenv cmake panotools libtiff libpng boost pkgconfig
       exiv2 gettext ilmbase enblendenfuse autopanosiftc;
     inherit wxGTK;
     openexr = openexr_1_6_1;
-    stdenv = overrideGCC stdenv gcc43_wrapper2;
   };
 
   i810switch = import ../applications/misc/i810 {
@@ -7443,8 +7436,7 @@ let
   };
 
   paraview = import ../applications/graphics/paraview {
-    inherit fetchurl cmake qt4;
-    stdenv = overrideGCC stdenv gcc43_wrapper2;
+    inherit fetchurl stdenv cmake qt4;
   };
 
   partitionManager = import ../tools/misc/partition-manager {