diff options
| author | Sou Bunnbu <iyzsong@gmail.com> | 2015-06-24 19:16:22 +0800 |
|---|---|---|
| committer | Sou Bunnbu <iyzsong@gmail.com> | 2015-06-24 19:16:22 +0800 |
| commit | c7c8f4a780552f01186bae4e170725e9f474e578 (patch) | |
| tree | 9c2406d6d9fe3853218548da822826f90608fbaf /pkgs/applications | |
| parent | 2c944fd4dd8c067d3b7badf5f0d0bf46367c63eb (diff) | |
| parent | 7c0c2dc15bd6599fe818651a9ba8d05dbadd896f (diff) | |
| download | nixlib-c7c8f4a780552f01186bae4e170725e9f474e578.tar nixlib-c7c8f4a780552f01186bae4e170725e9f474e578.tar.gz nixlib-c7c8f4a780552f01186bae4e170725e9f474e578.tar.bz2 nixlib-c7c8f4a780552f01186bae4e170725e9f474e578.tar.lz nixlib-c7c8f4a780552f01186bae4e170725e9f474e578.tar.xz nixlib-c7c8f4a780552f01186bae4e170725e9f474e578.tar.zst nixlib-c7c8f4a780552f01186bae4e170725e9f474e578.zip | |
Merge pull request #8481 from iyzsong/master
tiled: update to 0.12.3 and build with qt5
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/editors/tiled/default.nix | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 92cd50713060..b885e26fbef9 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"; |