colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #63346 from vbgl/merkaartor-fix

Browse Source 
merkaartor: fix build & run
This commit is contained in:
Vincent Laporte 2019-06-26 03:59:13 +00:00 committed by GitHub
commit 0024cfcc49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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/;

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

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