BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merkaartor: 0.18.3 -> unstable-2019-11-12

Browse source
This commit is contained in:
adisbladis 2019-11-14 10:49:01 +00:00
parent ab3f50a1c0
commit 9ae9729708
No known key found for this signature in database
GPG key ID: 110BFAD44C6249B7
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/applications/misc/merkaartor/default.nix
View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "merkaartor";
version = "0.18.3";
version = "unstable-2019-11-12";
src = fetchFromGitHub {
owner = "openstreetmap";
repo = "merkaartor";
rev = version;
sha256 = "0ls3q8m1hxiwyrypy6qca8wczhl4969ncl0sszfdwfv70rzxjk88";
rev = "29b3388680a03f1daac0037a2b504ea710da879a";
sha256 = "0h3d3srzl06p2ajq911j05zr4vkl88qij18plydx45yqmvyvh0xz";
};
nativeBuildInputs = [ makeWrapper qmake pkgconfig ];
@ -30,6 +30,5 @@ stdenv.mkDerivation rec {
homepage = http://merkaartor.be/;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ ];
broken = true; # Does not build with qt >= 5.12
};
}

4
pkgs/top-level/all-packages.nix
View file

@ -19817,9 +19817,7 @@ in
mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; });
merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor {
gdal = gdal_2; # https://github.com/openstreetmap/merkaartor/issues/179
};
merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { };
meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { };