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

index 3d5537e4cef508d3b2393a2ed19b7f764b1bb5a2..3cf928587ab3ec791f55e0054235d44c4cab5690 100644

--- a/default.nix

+++ b/default.nix

@@ -81,6 +81,7 @@ libshell = callPackage ./pkgs/libshell {

 inherit (sources) libshell;

};

mapsoft = callPackage ./pkgs/mapsoft {

• inherit libshell;

 inherit (sources) mapsoft;

};

mbtileserver = callPackage ./pkgs/mbtileserver {

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

index 53f0e58493307f9ff029f030870916f9f1d16823..d92e2ad7a4bb7f626913b566a6810b7a37ef4d30 100644

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

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

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

{ stdenv, perlPackages, python2Packages, gimp, mapsoft

-, fig2dev, imagemagick, m4, netpbm, pkgconfig, scons

+, bc, fig2dev, imagemagick, m4, netpbm, pkgconfig, scons

, boost, curl, giflib, gtkmm2, jansson, libjpeg, libpng

-, libtiff, libusb1, libxml2, libyaml, libzip

+, libshell, libtiff, libusb1, libxml2, libyaml, libzip

, proj, shapelib, zlib }:

stdenv.mkDerivation rec {

@@ -48,6 +48,7 @@ proj

 shapelib

 zlib

];

• propagatedBuildInputs = [ bc libshell ];

preBuild = ''

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