merkaartor: 0.18.2 -> 0.18.3, Qt4 -> Qt5

authored by Yegor Timoshenko and committed by Orivej Desh e8ab9f97 5de2cffd

+14 -12
+13 -11
pkgs/applications/misc/merkaartor/default.nix
··· 1 - { stdenv, fetchFromGitHub, qt4, qmake4Hook, boost, proj, gdal, sqlite, pkgconfig }: 2 3 stdenv.mkDerivation rec { 4 name = "merkaartor-${version}"; 5 - version = "0.18.2"; 6 7 src = fetchFromGitHub { 8 owner = "openstreetmap"; 9 repo = "merkaartor"; 10 rev = version; 11 - sha256 = "1a8kzrc9w0b2a2zgw9dbbi15jy9ynv6nf2sg3k4dbh7f1s2ajx9l"; 12 }; 13 14 - buildInputs = [ qt4 boost proj gdal sqlite ]; 15 16 - nativeBuildInputs = [ qmake4Hook pkgconfig ]; 17 18 - meta = { 19 - description = "An openstreetmap editor"; 20 - homepage = http://merkaartor.org/; 21 - license = stdenv.lib.licenses.gpl2Plus; 22 - maintainers = with stdenv.lib.maintainers; [viric]; 23 - inherit (qt4.meta) platforms; 24 }; 25 }
··· 1 + { stdenv, fetchFromGitHub, qmake, pkgconfig, boost, gdal, proj 2 + , qtbase, qtsvg, qtwebkit }: 3 4 stdenv.mkDerivation rec { 5 name = "merkaartor-${version}"; 6 + version = "0.18.3"; 7 8 src = fetchFromGitHub { 9 owner = "openstreetmap"; 10 repo = "merkaartor"; 11 rev = version; 12 + sha256 = "0ls3q8m1hxiwyrypy6qca8wczhl4969ncl0sszfdwfv70rzxjk88"; 13 }; 14 15 + nativeBuildInputs = [ qmake pkgconfig ]; 16 17 + buildInputs = [ boost gdal proj qtbase qtsvg qtwebkit ]; 18 19 + enableParallelBuilding = true; 20 + 21 + meta = with stdenv.lib; { 22 + description = "OpenStreetMap editor"; 23 + homepage = http://merkaartor.be/; 24 + license = licenses.gpl2Plus; 25 + maintainers = with maintainers; [ viric ]; 26 }; 27 }
+1 -1
pkgs/top-level/all-packages.nix
··· 15376 15377 mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; }); 15378 15379 - merkaartor = callPackage ../applications/misc/merkaartor { }; 15380 15381 meshlab = callPackage ../applications/graphics/meshlab { }; 15382
··· 15376 15377 mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; }); 15378 15379 + merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; 15380 15381 meshlab = callPackage ../applications/graphics/meshlab { }; 15382