pyrox.dev
Merge pull request #188839 from muscaln/tiled-bump
+53
-7
pkgs/applications/editors/tiled/default.nix
+53
-7
pkgs/applications/editors/tiled/default.nix
···
1
-
{ lib, mkDerivation, fetchFromGitHub, pkg-config, qmake
2
-
, python3, qtbase, qttools }:
1
+
{ lib
2
+
, stdenv
3
+
, env
4
+
, fetchFromGitHub
5
+
, pkg-config
6
+
, qbs
7
+
, wrapQtAppsHook
8
+
, qtbase
9
+
, qtdeclarative
10
+
, qttools
11
+
, qtsvg
12
+
, zlib
13
+
, libGL
14
+
}:
3
15
4
-
mkDerivation rec {
16
+
let
17
+
qtEnv = env "tiled-qt-env" [ qtbase qtdeclarative qtsvg qttools ];
18
+
in
19
+
20
+
stdenv.mkDerivation rec {
5
21
pname = "tiled";
6
-
version = "1.8.4";
22
+
version = "1.9.2";
7
23
8
24
src = fetchFromGitHub {
9
25
owner = "bjorn";
10
26
repo = pname;
11
27
rev = "v${version}";
12
-
sha256 = "sha256-QYA2krbwH807BkzVST+/+sjSR6So/aGY/YenEjYxE48=";
28
+
sha256 = "sha256-026OO7r8n1BUapUtKRHvqKdSZiClTQIiYfajiC2TAcQ=";
13
29
};
14
30
15
-
nativeBuildInputs = [ pkg-config qmake ];
16
-
buildInputs = [ python3 qtbase qttools ];
31
+
nativeBuildInputs = [ pkg-config qbs wrapQtAppsHook ];
32
+
buildInputs = [ qtEnv zlib libGL ];
33
+
34
+
outputs = [ "out" "dev" ];
35
+
36
+
strictDeps = true;
37
+
38
+
configurePhase = ''
39
+
runHook preConfigure
40
+
41
+
qbs setup-qt --settings-dir . ${qtEnv}/bin/qmake qtenv
42
+
qbs config --settings-dir . defaultProfile qtenv
43
+
qbs resolve --settings-dir . config:release qbs.installPrefix:/ projects.Tiled.installHeaders:true
44
+
45
+
runHook postConfigure
46
+
'';
47
+
48
+
buildPhase = ''
49
+
runHook preBuild
50
+
51
+
qbs build --settings-dir . config:release
52
+
53
+
runHook postBuild
54
+
'';
55
+
56
+
installPhase = ''
57
+
runHook preInstall
58
+
59
+
qbs install --settings-dir . --install-root $out config:release
60
+
61
+
runHook postInstall
62
+
'';
17
63
18
64
meta = with lib; {
19
65
description = "Free, easy to use and flexible tile map editor";