diff --git a/pkgs/applications/mapsoft/0002-fix-build.patch b/pkgs/applications/mapsoft/0002-fix-build.patch

new file mode 100644

index 0000000000000000000000000000000000000000..b3b052ff07b5c3e11603090626cb02720ea2217f

--- /dev/null

+++ b/pkgs/applications/mapsoft/0002-fix-build.patch

@@ -0,0 +1,88 @@

+Submodule modules contains modified content

+diff --git i/modules/Makefile.inc w/modules/Makefile.inc

+index 3ff6a7a..da19730 100644

+--- i/modules/Makefile.inc

++++ w/modules/Makefile.inc

+@@ -50,9 +50,9 @@ $(shell $(MODDIR)/get_deps $(MODDIR) . > Makefile.deps)

• Building flags

• override CXXFLAGS += $(shell [ "$(PKG_CONFIG)" == "" ] ||\

+- PKG_CONFIG_PATH=$(MODDIR)/pc pkg-config --cflags '$(PKG_CONFIG)')

++ PKG_CONFIG_PATH=$(PKG_CONFIG_PATH):$(MODDIR)/pc pkg-config --cflags '$(PKG_CONFIG)')

• override LDLIBS += $(shell [ "$(PKG_CONFIG)" == "" ] ||\

+- PKG_CONFIG_PATH=$(MODDIR)/pc pkg-config --libs '$(PKG_CONFIG)')

++ PKG_CONFIG_PATH=$(PKG_CONFIG_PATH):$(MODDIR)/pc pkg-config --libs '$(PKG_CONFIG)')

• override CXXFLAGS += -std=gnu++11 -Werror=return-type -O2 -fPIC

• override CXXFLAGS += -I$(MODDIR)

+diff --git i/modules/cairo/Makefile w/modules/cairo/Makefile

+index 30aa283..d9e0b79 100644

+--- i/modules/cairo/Makefile

++++ w/modules/cairo/Makefile

+@@ -1,7 +1,7 @@

• MOD_SOURCES := cairo_wrapper.cpp

• MOD_HEADERS := cairo_wrapper.h

+-SCRIPT_TESTS := cairo1

++#SCRIPT_TESTS := cairo1

• PKG_CONFIG := gtkmm-3.0 fontconfig cairomm-1.0 cairomm-ft-1.0

• include ../Makefile.inc

+diff --git i/modules/pc/libdb.pc w/modules/pc/libdb.pc

+index 6a40e95..682c932 100644

+--- i/modules/pc/libdb.pc

++++ w/modules/pc/libdb.pc

+@@ -1,5 +1,11 @@

++prefix=@db@

++exec_prefix=${prefix}

++libdir=${exec_prefix}/lib

++includedir=${prefix}/include

++

• Name: libdb

• Description: libdb

• Requires:

• Version: 1

+-Libs: -ldb

++Libs: -L${libdir} -ldb

++Cflags: -I${includedir}

+diff --git i/modules/pc/libgif.pc w/modules/pc/libgif.pc

+index cb154c9..24d8898 100644

+--- i/modules/pc/libgif.pc

++++ w/modules/pc/libgif.pc

+@@ -1,5 +1,11 @@

++prefix=@giflib@

++exec_prefix=${prefix}

++libdir=${exec_prefix}/lib

++includedir=${prefix}/include

++

• Name: libgif

• Description: libgif

• Requires:

• Version: 1

+-Libs: -lgif

++Libs: -L${libdir} -lgif

++Cflags: -I${includedir}

+diff --git i/modules/tmpdir/Makefile w/modules/tmpdir/Makefile

+index d44adac..c0b361e 100644

+--- i/modules/tmpdir/Makefile

++++ w/modules/tmpdir/Makefile

+@@ -1,6 +1,6 @@

• MOD_HEADERS := tmpdir.h

• MOD_SOURCES := tmpdir.cpp

+-SCRIPT_TESTS := tmpdir

++#SCRIPT_TESTS := tmpdir

• PKG_CONFIG := libzip

+diff --git i/programs/ms2conv/Makefile w/programs/ms2conv/Makefile

+index 6adf510..57d2d38 100644

+--- i/programs/ms2conv/Makefile

++++ w/programs/ms2conv/Makefile

+@@ -7,7 +7,6 @@ OTHER_TESTS :=\

• ms2conv.test5\

• ms2conv.test6\

• ms2conv.test7\

+- ms2conv.test_img\

• ms2conv.test_mkref

• MODDIR := ../../modules

diff --git a/pkgs/applications/mapsoft/2.nix b/pkgs/applications/mapsoft/2.nix

new file mode 100644

index 0000000000000000000000000000000000000000..0922fbc800e14de287c554af97046ac1876d90c1

--- /dev/null

+++ b/pkgs/applications/mapsoft/2.nix

@@ -0,0 +1,61 @@

+{ stdenv, fetchFromGitHub, db, giflib, gsettings-desktop-schemas

+, gtkmm3, jansson, libjpeg, libpng, libtiff, libxml2, libzip

+, perlPackages, pkgconfig, proj, shapelib, unzip }:

+stdenv.mkDerivation rec {

• pname = "mapsoft2";

• version = "2020-02-27";

• src = fetchFromGitHub {

• owner = "slazav";

• repo = pname;

• rev = "048befdc24252c798d3c2339a34a25e8faa7c6f1";

• sha256 = "05fbcrikcnaydzl53m8gl42z8qgqyrn78ir95h76pkl2vkfdscyh";

• fetchSubmodules = true;

• };

• patches = [ ./0002-fix-build.patch ];

• postPatch = ''

• substituteInPlace modules/get_deps \

•  --replace "/usr/bin/perl" "${perlPackages.perl}/bin/perl"
  

• substituteInPlace modules/pc/libgif.pc \

•  --replace "@giflib@" "${giflib}"
  

• substituteInPlace modules/pc/libdb.pc \

•  --replace "@db@" "${db.dev}"
  

• substituteInPlace modules/mapview/mapview.cpp \

•  --replace "/usr/share" "${placeholder "out"}/share"
  

• patchShebangs .

• '';

• nativeBuildInputs = [

• perlPackages.perl

• pkgconfig

• unzip

• ];

• buildInputs = [

• db

• gsettings-desktop-schemas

• gtkmm3

• jansson

• libjpeg

• libpng

• libtiff

• libxml2

• libzip

• proj

• shapelib

• ];

• dontConfigure = true;

• makeFlags = [ "prefix=${placeholder "out"}" ];

• meta = with stdenv.lib; {

• description = "A collection of tools and libraries for working with maps and geo-data";

• homepage = "http://slazav.github.io/mapsoft2";

• license = licenses.gpl3;

• maintainers = with maintainers; [ sikmir ];

• platforms = platforms.linux;

• };

+}

diff --git a/pkgs/default.nix b/pkgs/default.nix

index d25c2ff48eec3b91c2c6766396ebfd47899e1ad8..5f5d7346654bd1c0e26c195a111eb38c2083dbac 100644

--- a/pkgs/default.nix

+++ b/pkgs/default.nix

@@ -52,6 +52,7 @@ ish = callPackage ./tools/networking/ish { };

libshell = callPackage ./development/libraries/libshell { };

macmillan = callPackage ./data/dicts/macmillan { };

mapsoft = callPackage ./applications/mapsoft { };

• mapsoft2 = callPackage ./applications/mapsoft/2.nix { };

maptourist = callPackage ./data/maps/maptourist { };

mbtileserver = callPackage ./servers/mbtileserver { };

mercantile = python3Packages.callPackage ./development/python-modules/mercantile {