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

index 1e621d5b6d33d5bda6c65af55a393e715909db70..75e071dfff47d1877d162cf267672060f0e0c588 100644

--- a/pkgs/applications/mapsoft/2.nix

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

@@ -1,4 +1,4 @@

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

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

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

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

@@ -14,15 +14,17 @@ sha256 = "1fb4r7nqj5z40s2pzl0i3p1gxcwxs3cca83i95a78n8gvjwkv9vm";

 fetchSubmodules = true;

};

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

• patches = [

• (substituteAll {

•  src = ./0002-fix-build.patch;
  

•  db = db.dev;
  

•  giflib = giflib;
  

• })

• ];

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 .

diff --git a/pkgs/data/maps/hiblovgpsmap/default.nix b/pkgs/data/maps/hiblovgpsmap/default.nix

index 37dfdac0b4033e7be224c17e0e3d06d041712ed0..3d81bb688181389a61f20d5992764fefa09981b9 100644

--- a/pkgs/data/maps/hiblovgpsmap/default.nix

+++ b/pkgs/data/maps/hiblovgpsmap/default.nix

@@ -7,20 +7,20 @@

src = fetchurl {

 url = "https://drive.google.com/uc?export=download&id=10aAOKY8U7TQvFvuWBkwTei9iP3-cUvoE";

 sha256 = "1079bn8rkdfsbqivxkm3zi327k2i4k5p20rr2jw7gacfsvdk4954";

• name = "OV-Hib-Lov-20191028-1.02.zip";

• name = "OV-Hib-Lov-${stdenv.lib.replaceStrings ["-"] [""] version}-1.02.zip";

};

nativeBuildInputs = [ unzip ];

unpackPhase = "unzip $src";

• dontConfigure = true;

dontBuild = true;

preferLocalBuild = true;

installPhase = ''

• install -dm755 "$out/share/gpxsee/maps"

• cp *.img "$out/share/gpxsee/maps"

• install -Dm644 *.img -t "$out/share/gpxsee/maps"

'';

meta = with stdenv.lib; {

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

index 5f5d7346654bd1c0e26c195a111eb38c2083dbac..3b246fbd562e1d3f5376aa62e211e19dbefc302e 100644

--- a/pkgs/default.nix

+++ b/pkgs/default.nix

@@ -100,5 +100,4 @@ perlPackages = (callPackage ./perl-packages.nix {

}) // pkgs.perlPackages // {

 recurseForDerivations = false;

};

• inherit (perlPackages) MatchSimple SubInfix MathPolygon MathPolygonTree MathGeometryPlanarGPCPolygonXS TreeR GeoOpenstreetmapParser;

})