ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-29 00:27:49 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #29972 from yegortimoshenko/merkaartor/qt5

Browse Source 
merkaartor: 0.18.2 -> 0.18.3, Qt4 -> Qt5
This commit is contained in:
Orivej Desh 2017-10-01 01:46:32 +00:00 committed by GitHub
commit 6b922a6220
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/applications/misc/merkaartor/default.nix
View File

@ -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 ];
};
}

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

@ -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 { };