There changes are based on patch <http://sprunge.us/bOMG> from goibhniu. svn path=/nixpkgs/trunk/; revision=27777