diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index 70a6efb90ddc..0833464f2c25 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qmake, pkgconfig, boost, gdal, proj +{ stdenv, fetchFromGitHub, makeWrapper, qmake, pkgconfig, boost, gdal, proj , qtbase, qtsvg, qtwebkit }: stdenv.mkDerivation rec { @@ -12,12 +12,17 @@ stdenv.mkDerivation rec { sha256 = "0ls3q8m1hxiwyrypy6qca8wczhl4969ncl0sszfdwfv70rzxjk88"; }; - nativeBuildInputs = [ qmake pkgconfig ]; + nativeBuildInputs = [ makeWrapper qmake pkgconfig ]; buildInputs = [ boost gdal proj qtbase qtsvg qtwebkit ]; enableParallelBuilding = true; + postInstall = '' + wrapProgram $out/bin/merkaartor \ + --set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms + ''; + meta = with stdenv.lib; { description = "OpenStreetMap editor"; homepage = http://merkaartor.be/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b5bac38d3de..0b890f34b7f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19034,7 +19034,7 @@ in mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; }); - merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; + merkaartor = libsForQt59.callPackage ../applications/misc/merkaartor { }; meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { };