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

merkaator: unstable-2019-11-12 -> 0.18.4

Browse Source
This commit is contained in:
freezeboy 2020-12-12 12:25:00 +01:00
parent e526a4f72d
commit bc797e287a
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,18 +1,25 @@
{ stdenv, fetchFromGitHub, makeWrapper, qmake, pkgconfig, boost, gdal, proj { mkDerivation, lib, fetchFromGitHub, qmake, pkgconfig, fetchpatch
, qtbase, qtsvg, qtwebview, qtwebkit }: , boost, gdal, proj, qtbase, qtsvg, qtwebview, qtwebkit }:
stdenv.mkDerivation rec { mkDerivation rec {
pname = "merkaartor"; pname = "merkaartor";
version = "unstable-2019-11-12"; version = "0.18.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "openstreetmap"; owner = "openstreetmap";
repo = "merkaartor"; repo = "merkaartor";
rev = "29b3388680a03f1daac0037a2b504ea710da879a"; rev = version;
sha256 = "0h3d3srzl06p2ajq911j05zr4vkl88qij18plydx45yqmvyvh0xz"; 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 ]; 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"; NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H";
postInstall = '' meta = with lib; {
wrapProgram $out/bin/merkaartor \
--set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms
'';
meta = with stdenv.lib; {
description = "OpenStreetMap editor"; description = "OpenStreetMap editor";
homepage = "http://merkaartor.be/"; homepage = "http://merkaartor.be/";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;

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

@ -22946,8 +22946,7 @@ in
mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; }); mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; });
# Needs qtwebkit which is broken on qt5.15 merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { };
merkaartor = libsForQt514.callPackage ../applications/misc/merkaartor { };
meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { }; meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { };