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

tiled: Qt 5 infrastructure update

Browse Source
This commit is contained in:
Thomas Tuegel 2015-12-19 20:25:57 -06:00
parent 07a79f2a9b
commit e292103d46
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, qt5, pkgconfig, python }:
{ stdenv, fetchurl, qtbase, qttools, pkgconfig, python }:
let
version = "0.12.3";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
inherit sha256;
};
buildInputs = [ qt5.base qt5.tools pkgconfig python ];
buildInputs = [ qtbase qttools pkgconfig python ];
preConfigure = "qmake -r PREFIX=$out";

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

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