cataclysm-dda{,-git}: name -> pname and version

pkgs/games/cataclysm-dda/common.nix

···
     ++ optionals stdenv.isDarwin [ Cocoa ];
 
   common = {
+    pname = "cataclysm-dda";
+
     nativeBuildInputs = [ pkgconfig ];
 
     buildInputs = cursesDeps ++ optionals tiles tilesDeps;

pkgs/games/cataclysm-dda/default.nix

···
 
 stdenv.mkDerivation (common // rec {
   version = "0.E-2";
-  name = "cataclysm-dda-${version}";
 
   src = fetchFromCleverRaven {
     rev = version;

pkgs/games/cataclysm-dda/git.nix

···
 in
 
 stdenv.mkDerivation (common // rec {
+  pname = common.pname + "-git";
   version = "2019-11-22";
-  name = "cataclysm-dda-git-${version}";
 
   src = fetchFromCleverRaven {
     rev = "a6c8ece992bffeae3788425dd4b3b5871e66a9cd";