diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index 79ee45b4c1c..e73805f67b3 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -1,18 +1,25 @@ -{ stdenv, fetchFromGitHub, makeWrapper, qmake, pkgconfig, boost, gdal, proj -, qtbase, qtsvg, qtwebview, qtwebkit }: +{ mkDerivation, lib, fetchFromGitHub, qmake, pkgconfig, fetchpatch +, boost, gdal, proj, qtbase, qtsvg, qtwebview, qtwebkit }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "merkaartor"; - version = "unstable-2019-11-12"; + version = "0.18.4"; src = fetchFromGitHub { owner = "openstreetmap"; repo = "merkaartor"; - rev = "29b3388680a03f1daac0037a2b504ea710da879a"; - sha256 = "0h3d3srzl06p2ajq911j05zr4vkl88qij18plydx45yqmvyvh0xz"; + rev = version; + sha256 = "vwO4/a7YF9KbpxcFGTFCdG6SfwEyhISlEtcA+rMebUA="; }; - nativeBuildInputs = [ makeWrapper qmake pkgconfig ]; + patches = [ + (fetchpatch { + url = "https://github.com/openstreetmap/merkaartor/commit/e72553a7ea2c7ba0634cc3afcd27a9f7cfef089c.patch"; + sha256 = "NAisplnS3xHSlRpX+fH15NpbaD+uM57OCsTYGKlIR7U="; + }) + ]; + + nativeBuildInputs = [ qmake pkgconfig ]; buildInputs = [ boost gdal proj qtbase qtsvg qtwebview qtwebkit ]; @@ -20,12 +27,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"; - postInstall = '' - wrapProgram $out/bin/merkaartor \ - --set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms - ''; - - meta = with stdenv.lib; { + meta = with lib; { description = "OpenStreetMap editor"; homepage = "http://merkaartor.be/"; license = licenses.gpl2Plus; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13b9b68b091..8cf7279fbdd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22946,8 +22946,7 @@ in mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; }); - # Needs qtwebkit which is broken on qt5.15 - merkaartor = libsForQt514.callPackage ../applications/misc/merkaartor { }; + merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { };