nur-packages

commit bd4a2e90e1e2edbb24bfaa4ef12dda674d564a03
parent dd5a8efa7c46cabe78801129ca56a1017bd1987a
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date:   Wed, 15 Jan 2020 14:51:55 +0300

Update mapsoft

Diffstat:
M
default.nix
 | 
1
+
M
pkgs/mapsoft/default.nix
 | 
5
+++--

2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/default.nix b/default.nix
@@ -81,6 +81,7 @@ in rec {
     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
@@ -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 @@ stdenv.mkDerivation rec {
     shapelib
     zlib
   ];
+  propagatedBuildInputs = [ bc libshell ];
 
   preBuild = ''
     export CPPFLAGS="-I${boost.dev}/include -I${giflib}/include"