* Build callgrind so that it doesn't need its own copy of valgrind. * Add kcachegrind and callgrind to the cache. svn path=/nixpkgs/trunk/; revision=4635