anchor.diff:  
   
   	defFixupW = FullDepEntry "
  +
   # The fixup phase performs generic, package-independent, Nix-related
   # stuff, like running patchelf and setting the
   # propagated-build-inputs.  It should rarely be overriden.
   fixupW() {
  -    if test -n \"\$fixupPhase\"; then
  -        eval \"\$fixupPhase\"
  -        return
  -    fi
  -
  -    eval \"\$preFixup\"
  -
  - 	forceShare=\${forceShare:=man doc info}
  - 	if test -n \"\$forceShare\"; then
  - 		for d in \$forceShare; do
  - 			if test -d \"\$prefix/\$d\"; then
  - 				if test -d \"\$prefix/share/\$d\"; then
  - 					echo \"Both \$d/ and share/\$d/ exists, aborting\" 
  +    if test -n "$fixupPhase"; then
  +        eval "$fixupPhase"
  +        return
  +    fi
  +
  +    eval "$preFixup"
  +
  + 	forceShare=${forceShare:=man doc info}
  + 	if test -n "$forceShare"; then
  + 		for d in $forceShare; do
  + 			if test -d "$prefix/$d"; then
  + 				if test -d "$prefix/share/$d"; then
  + 					echo "Both $d/ and share/$d/ exists!"
    				else
  - 					ensureDir \$prefix/share
  -					if test -w \$prefix/share; then
  -	 					mv -v \$prefix/\$d \$prefix/share
  - 						ln -sv share/\$d \$prefix
  +					echo Fixing location of $dir/ subdirectory
  + 					ensureDir $prefix/share
  +					if test -w $prefix/share; then
  +	 					mv -v $prefix/$d $prefix/share
  + 						ln -sv share/$d $prefix
   					fi
    				fi
  +			else
  +				echo "No $d/ subdirectory, skipping."
    			fi
    		done;
    	fi
  - 
  - 
  +
  +
   # TODO : strip _only_ ELF executables, and return || fail here...
  -    if test -z \"\$dontStrip\"; then
  -		test -d \"\$prefix/lib\" && stripDebug=\"\$prefix/lib\"
  -
  -		if test -n \"\$stripDebug\"; then
  -			find \"\$stripDebug\" -type f -print0 |
  -			xargs -0 strip --strip-debug --verbose || true
  -		fi
  -
  -		test -d \"\$prefix/bin\" && stripAll=\"\$prefix/bin\"
  -		test -d \"\$prefix/sbin\" && stripAll=\"\${stripAll} \$prefix/sbin\"
  -		if test -n \"\$stripAll\"; then
  -			find \"\$prefix/bin\" \"\$prefix/sbin\" -type f -print0 |
  -			xargs -0 strip --strip-all --verbose || true
  -		fi
  -    fi
  -
  -	if test -z \"\$dontFixupShare\"; then
  -		for dir in doc info man; do
  -			if test -d \"\$prefix/\$dir\"; then
  -				if test -d \"\$prefix/share/\$dir\"; then
  -					echo Both \"\$prefix/\$dir\" and \"\$prefix/share/\$dir\" exists!
  -				else
  -					echo Fixing location of \$dir/ subdirectory
  -					ensureDir \"\$prefix/share\"
  -					if test -w \$prefix/share; then
  -						mv -v \"\$prefix/\$dir\" \"\$prefix/share\"
  -						ln -sv \"share/\$dir\" \"\$prefix\"
  -					fi
  -				fi
  -			fi
  -		done
  +    if test -z "$dontStrip"; then
  +		echo "Stripping debuging symbols from files in"
  +		stripDirs "${stripDebugList:-lib}" -S
  +		echo "Stripping all symbols from files in"
  +		stripDirs "${stripAllList:-bin sbin}" -s
  +    fi
  +
  +    if test "$havePatchELF" = 1 -a -z "$dontPatchELF"; then
  +        patchELF "$prefix"
  +    fi
  +
  +    if test -n "$propagatedBuildInputs"; then
  +        ensureDir "$out/nix-support"
  +        echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs"
  +    fi
  +
  +	if test -n "$setupHook"; then
  +		ensureDir "$out/nix-support"
  +		substituteAll "$setupHook" "$out/nix-support/setup-hook"
   	fi
   
  -    if test \"\$havePatchELF\" = 1 -a -z \"\$dontPatchELF\"; then
  -        patchELF \"\$prefix\"
  -    fi
  -
  -    if test -n \"\$propagatedBuildInputs\"; then
  -        ensureDir \"\$out/nix-support\"
  -        echo \"\$propagatedBuildInputs\" > \"\$out/nix-support/propagated-build-inputs\"
  -    fi
  -
  -	if test -n \"\$setupHook\"; then
  -		ensureDir \"\$out/nix-support\"
  -		substituteAll \"\$setupHook\" \"\$out/nix-support/setup-hook\"
  -	fi
  -
  -    eval \"\$postFixup\"
  +    eval "$postFixup"
   }
   " [defPatchElf initPath];
   
  
positive.code:         done
      fi
  }
  " [initPath];
  
  	getInputs = FullDepEntry "pkgs=\"\"
  if test -n \"\$buildinputs\"; then
  
negative.code: rec {
  	setStrictMode = noDepEntry "set -e;";
  	setNixGcc = noDepEntry "test -z \$NIX_GCC && NIX_GCC=@gcc@;";
  
  	setPathDelimiter = noDepEntry "
  if [ -z ${system##*cygwin*} ]; then
    PATH_DELIMITER=;
  else
    PATH_DELIMITER=;
  fi
  " ;
  
  	
  	initPath = noDepEntry "# Set up the initial path.
  PATH=
  