nur-packages

commit 3634bbc4bc4e77347cc3194f0ed965c53bfe6b5c
parent e2b645ef60c81dffba506be32dea6182a3873747
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date:   Sat, 22 Jul 2023 01:03:09 +0400

mapsoft2: 2.0 → 2.2

Diffstat:
M
pkgs/geospatial/mapsoft/2.nix
 | 
8
++++++--

1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/pkgs/geospatial/mapsoft/2.nix b/pkgs/geospatial/mapsoft/2.nix
@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mapsoft2";
-  version = "2.0";
+  version = "2.2";
 
   src = fetchFromGitHub {
     owner = "slazav";
     repo = "mapsoft2";
     rev = "${finalAttrs.version}-alt1";
-    hash = "sha256-cZHxCqfAY0DT3Zr3AdY3BMtzsiC9yXA2CUD/uM27SRE=";
+    hash = "sha256-++v9rlBmH/65XwI7uz6Vdk8NAPOq5jwwqiKpzxD76A8=";
     fetchSubmodules = true;
   };
 
@@ -54,6 +54,10 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace vmap_data/scripts/vmaps_get_fig --replace "vmaps.sh" "$out/bin/vmaps.sh"
     substituteInPlace vmap_data/scripts/vmaps_in --replace "vmaps.sh" "$out/bin/vmaps.sh"
     substituteInPlace vmap_data/scripts/vmaps.sh --replace "/usr" "$out"
+
+    # https://github.com/slazav/mapsoft2-libs/commit/9300f93e171769bbf8710d9dfa5f2724b7b6142d
+    substituteInPlace modules/geo_data/conv_geo.test.cpp \
+      --replace "PROJ_AT_LEAST_VERSION(9, 2, 1)" "PROJ_AT_LEAST_VERSION(9, 2, 0)"
   '';
 
   nativeBuildInputs = [