diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-11 01:02:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-11 01:02:21 +0000 |
| commit | 36bab113bfe0793dc458a8627a4eba3d88da12ec (patch) | |
| tree | a4e5bb03f6923378d701c420b91ff4a14bf569b4 /pkgs/games | |
| parent | dd7235715565d6dde51b3cf5861d17484084b426 (diff) | |
| parent | f337a3fc227b056e044388b15e646a091697a4e5 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/vassal/default.nix | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix index 413d98d26ace..dd6c4e36e3c4 100644 --- a/pkgs/games/vassal/default.nix +++ b/pkgs/games/vassal/default.nix @@ -1,11 +1,12 @@ -{ stdenv, fetchurl, jre, makeWrapper }: +{ stdenv, fetchzip, jre, makeWrapper }: stdenv.mkDerivation rec { - name = "VASSAL-3.3.2"; + pname = "VASSAL"; + version = "3.4.12"; - src = fetchurl { - url = "mirror://sourceforge/vassalengine/${name}-linux.tar.bz2"; - sha256 = "1abhlkl27gyfa1lghvv76xa6ks5hiwv2s9wb9ddadm0m07f87n1w"; + src = fetchzip { + url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2"; + sha256 = "0xn403fxz6ay5lv8whyfdq611kvxj5q309bj317yw5cxbb08w1yb"; }; buildInputs = [ makeWrapper ]; @@ -13,7 +14,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin $out/share/vassal $out/doc - cp CHANGES LICENSE README $out + cp CHANGES LICENSE README.md $out cp -R lib/* $out/share/vassal cp -R doc/* $out/doc @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free, open-source boardgame engine"; homepage = "http://www.vassalengine.org/"; - license = licenses.lgpl21; + license = licenses.lgpl21Only; maintainers = with maintainers; [ tvestelind ]; platforms = platforms.linux; }; |