Adjust to the NixOS/Nixpkgs merge

Created by  Eelco Dolstra  on October 11, 2013
WGDX4QRICBVWJWAC6QYZ7KJWQHAYBJDF4HCAOOZWELKHNYV6GFIQC
Change contents