From 7c0c2dc15bd6599fe818651a9ba8d05dbadd896f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Wed, 24 Jun 2015 17:12:07 +0800
Subject: [PATCH] tiled: update to 0.12.3 and build with qt5

---
 pkgs/applications/editors/tiled/default.nix | 15 ++++++++++-----
 pkgs/top-level/all-packages.nix             |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix
index 92cd5071306..b885e26fbef 100644
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/pkgs/applications/editors/tiled/default.nix
@@ -1,14 +1,19 @@
-{ stdenv, fetchurl, qt }:
+{ stdenv, fetchurl, qt5, pkgconfig, python }:
+
+let
+  version = "0.12.3";
+  sha256 = "001j4lvb5d9h3m6vgz2na07637x6xg4bdvxi2hg4a0j9rikb4y40";
+in
 
 stdenv.mkDerivation rec {
-  name = "tiled-0.11.0";
+  name = "tiled-${version}";
 
   src = fetchurl {
-    url = "https://github.com/bjorn/tiled/archive/v0.11.0.tar.gz";
-    sha256 = "03a15vbzjfwc8dpifbjvd0gnr208mzmdkgs2nlc8zq6z0a4h4jqd";
+    url = "https://github.com/bjorn/tiled/archive/v${version}.tar.gz";
+    inherit sha256;
   };
 
-  buildInputs = [ qt ];
+  buildInputs = [ qt5.base qt5.tools pkgconfig python ];
 
   preConfigure = "qmake -r PREFIX=$out";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e7831467504..72dfe213a88 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3043,7 +3043,7 @@ let
 
   thc-hydra = callPackage ../tools/security/thc-hydra { };
 
-  tiled = callPackage ../applications/editors/tiled { qt = qt4; };
+  tiled = callPackage ../applications/editors/tiled { };
 
   tinc = callPackage ../tools/networking/tinc { };