tiled: 0.12.3 -> 0.16.0; clean up; maintain

+20 -15
+20 -15
pkgs/applications/editors/tiled/default.nix
··· 1 - { stdenv, fetchurl, qtbase, qttools, qmakeHook, pkgconfig, python }: 1 + { stdenv, fetchurl, pkgconfig, qmakeHook 2 + , python, qtbase, qttools, zlib }: 2 3 3 4 let 4 - version = "0.12.3"; 5 - sha256 = "001j4lvb5d9h3m6vgz2na07637x6xg4bdvxi2hg4a0j9rikb4y40"; 6 - in 7 - 8 - stdenv.mkDerivation rec { 5 + # qtEnv = with qt5; env "qt-${qtbase.version}" [ qtbase qttools ]; 6 + in stdenv.mkDerivation rec { 9 7 name = "tiled-${version}"; 8 + version = "0.16.0"; 10 9 11 10 src = fetchurl { 11 + name = "${name}.tar.gz"; 12 12 url = "https://github.com/bjorn/tiled/archive/v${version}.tar.gz"; 13 - inherit sha256; 13 + sha256 = "1vlhfkgl126irp53xw94jw1xnj96l1hwnbxmm1s5az60460gfbf0"; 14 14 }; 15 15 16 - buildInputs = [ qtbase qttools qmakeHook pkgconfig python ]; 16 + nativeBuildInputs = [ pkgconfig qmakeHook ]; 17 + buildInputs = [ python qtbase qttools ]; 18 + 19 + enableParallelBuilding = true; 17 20 18 - meta = { 19 - description = "A free, easy to use and flexible tile map editor"; 20 - homepage = "http://www.mapeditor.org/"; 21 - # libtiled and tmxviewer is licensed under 2-calause BSD license. 22 - # The rest is GPL2 or later. 23 - license = stdenv.lib.licenses.gpl2Plus; 24 - platforms = stdenv.lib.platforms.linux; 21 + meta = with stdenv.lib; { 22 + description = "Free, easy to use and flexible tile map editor"; 23 + homepage = http://www.mapeditor.org/; 24 + license = with licenses; [ 25 + bsd2 # libtiled and tmxviewer 26 + gpl2Plus # all the rest 27 + ]; 28 + platforms = platforms.linux; 29 + maintainers = with maintainers; [ nckx ]; 25 30 }; 26 31 }