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

pkgs/applications/taxes/aangifte-2007/builder.sh

@@ -1,11 +1,13 @@
 source $stdenv/setup
 
+echo $NIX_GCC
+
 buildPhase=buildPhase
 buildPhase() {
     for i in bin/*; do
         patchelf \
             --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
-            --set-rpath $libX11/lib:$libXext/lib:$libSM/lib \
+            --set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \
             $i
     done
 }

pkgs/applications/taxes/aangifte-2007/default.nix

@@ -12,6 +12,7 @@ stdenv.mkDerivation {
   inherit libX11 libXext libSM;
 
   dontStrip = true;
+  dontPatchELF = true;
 
   meta = {
     description = "Elektronische aangifte IB 2007";