diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index a1744f7a2c03..d1befec34082 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -1,25 +1,27 @@ -{ stdenv, fetchFromGitHub, qt4, qmake4Hook, boost, proj, gdal, sqlite, pkgconfig }: +{ stdenv, fetchFromGitHub, qmake, pkgconfig, boost, gdal, proj +, qtbase, qtsvg, qtwebkit }: stdenv.mkDerivation rec { name = "merkaartor-${version}"; - version = "0.18.2"; + version = "0.18.3"; src = fetchFromGitHub { owner = "openstreetmap"; repo = "merkaartor"; rev = version; - sha256 = "1a8kzrc9w0b2a2zgw9dbbi15jy9ynv6nf2sg3k4dbh7f1s2ajx9l"; + sha256 = "0ls3q8m1hxiwyrypy6qca8wczhl4969ncl0sszfdwfv70rzxjk88"; }; - buildInputs = [ qt4 boost proj gdal sqlite ]; + nativeBuildInputs = [ qmake pkgconfig ]; - nativeBuildInputs = [ qmake4Hook pkgconfig ]; + buildInputs = [ boost gdal proj qtbase qtsvg qtwebkit ]; - meta = { - description = "An openstreetmap editor"; - homepage = http://merkaartor.org/; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - inherit (qt4.meta) platforms; + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "OpenStreetMap editor"; + homepage = http://merkaartor.be/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ viric ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dcefe7f9ed4b..a5305900916d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15376,7 +15376,7 @@ with pkgs; mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; }); - merkaartor = callPackage ../applications/misc/merkaartor { }; + merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; meshlab = callPackage ../applications/graphics/meshlab { };