diff options
author | Mustafa Çalışkan <muscaln@protonmail.com> | 2022-08-29 21:31:32 +0300 |
---|---|---|
committer | Mustafa Çalışkan <muscaln@protonmail.com> | 2022-11-19 09:47:39 +0300 |
commit | 49c5922675469bcd8b2c5aa457a806b4b1fd384b (patch) | |
tree | 977f7ad0d725d845b475362b9a8c1f0d711edc2b | |
parent | a04a4bbbeb5476687a5a1444a187c4b2877233ed (diff) |
tiled: 1.8.4 > 1.9.2
-rw-r--r-- | pkgs/applications/editors/tiled/default.nix | 60 |
1 files changed, 53 insertions, 7 deletions
diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 7be6d48971094..03c6d19b80c45 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -1,19 +1,65 @@ -{ lib, mkDerivation, fetchFromGitHub, pkg-config, qmake -, python3, qtbase, qttools }: +{ lib +, stdenv +, env +, fetchFromGitHub +, pkg-config +, qbs +, wrapQtAppsHook +, qtbase +, qtdeclarative +, qttools +, qtsvg +, zlib +, libGL +}: -mkDerivation rec { +let + qtEnv = env "tiled-qt-env" [ qtbase qtdeclarative qtsvg qttools ]; +in + +stdenv.mkDerivation rec { pname = "tiled"; - version = "1.8.4"; + version = "1.9.2"; src = fetchFromGitHub { owner = "bjorn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QYA2krbwH807BkzVST+/+sjSR6So/aGY/YenEjYxE48="; + sha256 = "sha256-026OO7r8n1BUapUtKRHvqKdSZiClTQIiYfajiC2TAcQ="; }; - nativeBuildInputs = [ pkg-config qmake ]; - buildInputs = [ python3 qtbase qttools ]; + nativeBuildInputs = [ pkg-config qbs wrapQtAppsHook ]; + buildInputs = [ qtEnv zlib libGL ]; + + outputs = [ "out" "dev" ]; + + strictDeps = true; + + configurePhase = '' + runHook preConfigure + + qbs setup-qt --settings-dir . ${qtEnv}/bin/qmake qtenv + qbs config --settings-dir . defaultProfile qtenv + qbs resolve --settings-dir . config:release qbs.installPrefix:/ projects.Tiled.installHeaders:true + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + qbs build --settings-dir . config:release + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + qbs install --settings-dir . --install-root $out config:release + + runHook postInstall + ''; meta = with lib; { description = "Free, easy to use and flexible tile map editor"; |