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

index d58f9f30d7e7b24cfff77a8ae7224270017144a8..79f544f307aa3e15a6d9020d5d4d4d136d449872 100644

--- a/pkgs/default.nix

+++ b/pkgs/default.nix

@@ -109,7 +109,9 @@

 basecamp = callPackage ./garmin/basecamp { };

 cgpsmapper = callPackage ./garmin/cgpsmapper { };

 garmin-uploader = callPackage ./garmin/garmin-uploader { };

• garminimg = libsForQt5.callPackage ./garmin/garminimg { };

• garminimg = libsForQt5.callPackage ./garmin/garminimg {

•  proj = pkgs.proj_7;
  

• };

 gimgtools = callPackage ./garmin/gimgtools { };

 gmaptool = callPackage ./garmin/gmaptool { };

 imgdecode = callPackage ./garmin/imgdecode { };

@@ -160,8 +162,12 @@ click = click-6-7;

 };

 geographiclib = callPackage ./geospatial/geographiclib { };

 go-staticmaps = callPackage ./geospatial/go-staticmaps { };

• mapsoft = callPackage ./geospatial/mapsoft { };

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

• mapsoft = callPackage ./geospatial/mapsoft {

•  proj = pkgs.proj_7;
  

• };

• mapsoft2 = callPackage ./geospatial/mapsoft/2.nix {

•  proj = pkgs.proj_7;
  

• };

 mbtiles2osmand = callPackage ./geospatial/mbtiles2osmand { };

 polyvectorization = libsForQt5.callPackage ./geospatial/polyvectorization { };

 py-staticmaps = callPackage ./geospatial/py-staticmaps { };

diff --git a/pkgs/geospatial/mapsoft/0001-fix-build.patch b/pkgs/geospatial/mapsoft/0001-fix-build.patch

index 69eee3d8246bfbc851497a651387a4bab33bb853..75bd7f75c019d01f77fe67a2b6fc42a76f2d1d97 100644

--- a/pkgs/geospatial/mapsoft/0001-fix-build.patch

+++ b/pkgs/geospatial/mapsoft/0001-fix-build.patch

@@ -58,7 +58,7 @@ ##################################################

build mapsoft library

-env.UseLibs('libxml-2.0 libzip libproj libgif libjpeg libpng libtiff-4 libcurl zlib yaml-0.1 shp jansson')

-+env.UseLibs('libxml-2.0 libzip proj libjpeg libpng libtiff-4 libcurl zlib yaml-0.1 shapelib jansson')

++env.UseLibs('libxml-2.0 libzip libjpeg libpng libtiff-4 libcurl zlib yaml-0.1 shapelib jansson')

env.UseLibs('glibmm-2.4 gtkmm-2.4 gthread-2.0')

env.UseLibs('cairomm-1.0 pixman-1 freetype2 libusb-1.0')

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

index 8e1b243ae8e8c0556451f2aa960e62853ee33929..6fc54b722883ec7808cef4129d83bb0c4d134693 100644

--- a/pkgs/geospatial/mapsoft/default.nix

+++ b/pkgs/geospatial/mapsoft/default.nix

@@ -83,8 +83,8 @@ ];

propagatedBuildInputs = [ bc libshell ];

preBuild = ''

• export CPPFLAGS="-I${boost.dev}/include -I${giflib}/include"

• export LINKFLAGS="-L${giflib}/lib -lgif"

• export CPPFLAGS="-I${boost.dev}/include -I${giflib}/include -I${proj.dev}/include"

• export LINKFLAGS="-L${giflib}/lib -lgif -L${proj}/lib -lproj"

'';

sconsFlags = [ "minimal=1" "prefix=$(out)" ];