Should this really be x86_64-linux only? Why? svn path=/nixpkgs/trunk/; revision=30583
svn path=/nixpkgs/trunk/; revision=30578