diff options
| author | Mitsuhiro Nakamura <m.nacamura@gmail.com> | 2020-04-07 14:13:08 +0900 |
|---|---|---|
| committer | Mitsuhiro Nakamura <m.nacamura@gmail.com> | 2020-07-18 14:21:09 +0900 |
| commit | d6863de058d61a35bef6d6c9221171ed040fc075 (patch) | |
| tree | c03bceceb52eeb3c7571d2c85e0df629b7a7ed87 /pkgs/games/cataclysm-dda | |
| parent | 5da2d61bd4fc0f3d7829d132dc9c809ab15f8532 (diff) | |
| download | nixpkgs-d6863de058d61a35bef6d6c9221171ed040fc075.tar nixpkgs-d6863de058d61a35bef6d6c9221171ed040fc075.tar.gz nixpkgs-d6863de058d61a35bef6d6c9221171ed040fc075.tar.bz2 nixpkgs-d6863de058d61a35bef6d6c9221171ed040fc075.tar.lz nixpkgs-d6863de058d61a35bef6d6c9221171ed040fc075.tar.xz nixpkgs-d6863de058d61a35bef6d6c9221171ed040fc075.tar.zst nixpkgs-d6863de058d61a35bef6d6c9221171ed040fc075.zip | |
cataclysm-dda{,-git}: name -> pname and version
Diffstat (limited to 'pkgs/games/cataclysm-dda')
| -rw-r--r-- | pkgs/games/cataclysm-dda/common.nix | 2 | ||||
| -rw-r--r-- | pkgs/games/cataclysm-dda/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/games/cataclysm-dda/git.nix | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix index f904a3c0f35..bf071d62c67 100644 --- a/pkgs/games/cataclysm-dda/common.nix +++ b/pkgs/games/cataclysm-dda/common.nix @@ -13,6 +13,8 @@ let ++ optionals stdenv.isDarwin [ Cocoa ]; common = { + pname = "cataclysm-dda"; + nativeBuildInputs = [ pkgconfig ]; buildInputs = cursesDeps ++ optionals tiles tilesDeps; diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix index c046b0d3a2d..490e5a45ac0 100644 --- a/pkgs/games/cataclysm-dda/default.nix +++ b/pkgs/games/cataclysm-dda/default.nix @@ -10,7 +10,6 @@ in stdenv.mkDerivation (common // rec { version = "0.E-2"; - name = "cataclysm-dda-${version}"; src = fetchFromCleverRaven { rev = version; diff --git a/pkgs/games/cataclysm-dda/git.nix b/pkgs/games/cataclysm-dda/git.nix index 8e3c3e33994..d7b4bf4bde1 100644 --- a/pkgs/games/cataclysm-dda/git.nix +++ b/pkgs/games/cataclysm-dda/git.nix @@ -10,8 +10,8 @@ let in stdenv.mkDerivation (common // rec { + pname = common.pname + "-git"; version = "2019-11-22"; - name = "cataclysm-dda-git-${version}"; src = fetchFromCleverRaven { rev = "a6c8ece992bffeae3788425dd4b3b5871e66a9cd"; |