public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8481 from iyzsong/master

Browse Source 
tiled: update to 0.12.3 and build with qt5
This commit is contained in:
Sou Bunnbu 2015-06-24 19:16:22 +08:00
commit c7c8f4a780
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/editors/tiled/default.nix
View File

@ -1,14 +1,19 @@
{ stdenv, fetchurl, qt }: { stdenv, fetchurl, qt5, pkgconfig, python }:
let
version = "0.12.3";
sha256 = "001j4lvb5d9h3m6vgz2na07637x6xg4bdvxi2hg4a0j9rikb4y40";
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "tiled-0.11.0"; name = "tiled-${version}";
src = fetchurl { src = fetchurl {
url = "https://github.com/bjorn/tiled/archive/v0.11.0.tar.gz"; url = "https://github.com/bjorn/tiled/archive/v${version}.tar.gz";
sha256 = "03a15vbzjfwc8dpifbjvd0gnr208mzmdkgs2nlc8zq6z0a4h4jqd"; inherit sha256;
}; };
buildInputs = [ qt ]; buildInputs = [ qt5.base qt5.tools pkgconfig python ];
preConfigure = "qmake -r PREFIX=$out"; preConfigure = "qmake -r PREFIX=$out";

2
pkgs/top-level/all-packages.nix
View File

@ -3043,7 +3043,7 @@ let
thc-hydra = callPackage ../tools/security/thc-hydra { }; thc-hydra = callPackage ../tools/security/thc-hydra { };
tiled = callPackage ../applications/editors/tiled { qt = qt4; }; tiled = callPackage ../applications/editors/tiled { };
tinc = callPackage ../tools/networking/tinc { }; tinc = callPackage ../tools/networking/tinc { };