nur-packages

commit 1f0256f47e518e7ea21676a7d89570a6ce2497b8
parent 6cf813571fbe59a69d8472ab7fa64fc8d95c90fb
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date:   Tue,  5 Oct 2021 00:15:26 +0300

mapsoft: fix build

Diffstat:
M
pkgs/default.nix
 | 
12
+++++++++---
M
pkgs/geospatial/mapsoft/0001-fix-build.patch
 | 
2
+-
M
pkgs/geospatial/mapsoft/default.nix
 | 
4
++--

3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -109,7 +109,9 @@ lib.makeScope newScope (
     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 @@ lib.makeScope newScope (
     };
     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
@@ -58,7 +58,7 @@ index fe5f1802..7238c176 100644
  ## 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
@@ -83,8 +83,8 @@ stdenv.mkDerivation rec {
   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)" ];