nur-packages

commit 1c54e14ca0a773aaf68b8609f97cac7dfad8d009
parent 9a2163508b552b88c5c20becf41f3010be5c0df5
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date:   Sun, 28 Jan 2024 18:28:15 +0400

Up

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

2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -212,7 +212,9 @@ lib.makeScope newScope (
       inherit (darwin.apple_sdk.frameworks) Security;
     };
     localtileserver = callPackage ./geospatial/localtileserver { };
-    mapsoft = callPackage ./geospatial/mapsoft { };
+    mapsoft = callPackage ./geospatial/mapsoft {
+      proj = pkgs.proj_7;
+    };
     mapsoft2 = callPackage ./geospatial/mapsoft/2.nix { };
     mbtiles2osmand = callPackage ./geospatial/mbtiles2osmand { };
     mbutiles = callPackage ./geospatial/mbutiles { };
diff --git a/pkgs/geospatial/mapsoft/default.nix b/pkgs/geospatial/mapsoft/default.nix
@@ -44,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [ ./0001-fix-build.patch ];
 
   postPatch = ''
+    sed -i '4i #include <cstdint>' core/loaders/image_png.cpp
     substituteInPlace scripts/map_rescale \
       --replace "/usr/share/mapsoft" "$out/share/mapsoft"
     substituteInPlace core/vmap/vmap_ocad.cpp \