From 1076c93de3778f818d7e4cfe68b5232808f34fa0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 23 Apr 2016 01:29:34 +0200
Subject: tiled: 0.12.3 -> 0.16.0; clean up; maintain

---
 pkgs/applications/editors/tiled/default.nix | 35 ++++++++++++++++-------------
 1 file changed, 20 insertions(+), 15 deletions(-)

(limited to 'pkgs/applications/editors/tiled')

diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix
index e4b2f0461c2..201db054743 100644
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/pkgs/applications/editors/tiled/default.nix
@@ -1,26 +1,31 @@
-{ stdenv, fetchurl, qtbase, qttools, qmakeHook, pkgconfig, python }:
+{ stdenv, fetchurl, pkgconfig, qmakeHook
+, python, qtbase, qttools, zlib }:
 
 let
-  version = "0.12.3";
-  sha256 = "001j4lvb5d9h3m6vgz2na07637x6xg4bdvxi2hg4a0j9rikb4y40";
-in
-
-stdenv.mkDerivation rec {
+#  qtEnv = with qt5; env "qt-${qtbase.version}" [ qtbase qttools ];
+in stdenv.mkDerivation rec {
   name = "tiled-${version}";
+  version = "0.16.0";
 
   src = fetchurl {
+    name = "${name}.tar.gz";
     url = "https://github.com/bjorn/tiled/archive/v${version}.tar.gz";
-    inherit sha256;
+    sha256 = "1vlhfkgl126irp53xw94jw1xnj96l1hwnbxmm1s5az60460gfbf0";
   };
 
-  buildInputs = [ qtbase qttools qmakeHook pkgconfig python ];
+  nativeBuildInputs = [ pkgconfig qmakeHook ];
+  buildInputs = [ python qtbase qttools ];
+
+  enableParallelBuilding = true;
 
-  meta = {
-    description = "A free, easy to use and flexible tile map editor";
-    homepage = "http://www.mapeditor.org/";
-    # libtiled and tmxviewer is licensed under 2-calause BSD license.
-    # The rest is GPL2 or later.
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
+  meta = with stdenv.lib; {
+    description = "Free, easy to use and flexible tile map editor";
+    homepage = http://www.mapeditor.org/;
+    license = with licenses; [
+      bsd2	# libtiled and tmxviewer
+      gpl2Plus	# all the rest
+    ];
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
   };
 }
-- 
cgit 1.4.1