pyrox.dev
Merge pull request #8481 from iyzsong/master
tiled: update to 0.12.3 and build with qt5
+10
-5
pkgs/applications/editors/tiled/default.nix
+10
-5
pkgs/applications/editors/tiled/default.nix
···
1
-
{ stdenv, fetchurl, qt }:
1
+
{ stdenv, fetchurl, qt5, pkgconfig, python }:
2
+
3
+
let
4
+
version = "0.12.3";
5
+
sha256 = "001j4lvb5d9h3m6vgz2na07637x6xg4bdvxi2hg4a0j9rikb4y40";
6
+
in
2
7
3
8
stdenv.mkDerivation rec {
4
-
name = "tiled-0.11.0";
9
+
name = "tiled-${version}";
5
10
6
11
src = fetchurl {
7
-
url = "https://github.com/bjorn/tiled/archive/v0.11.0.tar.gz";
8
-
sha256 = "03a15vbzjfwc8dpifbjvd0gnr208mzmdkgs2nlc8zq6z0a4h4jqd";
12
+
url = "https://github.com/bjorn/tiled/archive/v${version}.tar.gz";
13
+
inherit sha256;
9
14
};
10
15
11
-
buildInputs = [ qt ];
16
+
buildInputs = [ qt5.base qt5.tools pkgconfig python ];
12
17
13
18
preConfigure = "qmake -r PREFIX=$out";
14
19
+1
-1
pkgs/top-level/all-packages.nix
+1
-1
pkgs/top-level/all-packages.nix
···
3043
3043
3044
3044
thc-hydra = callPackage ../tools/security/thc-hydra { };
3045
3045
3046
-
tiled = callPackage ../applications/editors/tiled { qt = qt4; };
3046
+
tiled = callPackage ../applications/editors/tiled { };
3047
3047
3048
3048
tinc = callPackage ../tools/networking/tinc { };
3049
3049