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

Merge pull request #24088 from ndowens/tiled

Browse Source 
tiled: 0.17.0 -> 0.18.2
This commit is contained in:
ndowens 2017-03-19 18:37:26 -05:00 committed by GitHub
commit a289b03412
1 changed files with 8 additions and 7 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,16 +1,17 @@
{ stdenv, fetchurl, pkgconfig, qmakeHook { stdenv, fetchFromGitHub, pkgconfig, qmakeHook
, python, qtbase, qttools, zlib }: , python, qtbase, qttools, zlib }:
let let
# qtEnv = with qt5; env "qt-${qtbase.version}" [ qtbase qttools ]; # qtEnv = with qt5; env "qt-${qtbase.version}" [ qtbase qttools ];
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "tiled-${version}"; name = "tiled-${version}";
version = "0.17.0"; version = "0.18.2";
src = fetchurl { src = fetchFromGitHub {
name = "${name}.tar.gz"; owner = "bjorn";
url = "https://github.com/bjorn/tiled/archive/v${version}.tar.gz"; repo = "tiled";
sha256 = "0c9gykxmq0sk0yyfdq81g9psd922scqzn5asskjydj84d80f5z7p"; rev = "v${version}";
sha256 = "087jl36g6w2g5l70gz573iwyvx3r7i8fijl3y4mmmf8pyqdyq1n2";
}; };
nativeBuildInputs = [ pkgconfig qmakeHook ]; nativeBuildInputs = [ pkgconfig qmakeHook ];
@ -26,6 +27,6 @@ in stdenv.mkDerivation rec {
gpl2Plus # all the rest gpl2Plus # all the rest
]; ];
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ nckx ]; maintainers = [ maintainers.nckx ];
}; };
} }