nur-packages

commit 7fb19f4716f57415874b437fbca943ab63d2d27e
parent 0905cf9fdba2fa5660fcac894424848302c09031
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date:   Fri, 24 May 2024 23:43:15 +0400

Up

Diffstat:
M
pkgs/geospatial/mapsoft/0002-fix-build.patch
 | 
66
++++++++++++++++++++++--------------------------------------------
M
pkgs/geospatial/mapsoft/2.nix
 | 
25
+++++++++++--------------

2 files changed, 33 insertions(+), 58 deletions(-)
diff --git a/pkgs/geospatial/mapsoft/0002-fix-build.patch b/pkgs/geospatial/mapsoft/0002-fix-build.patch
@@ -1,46 +1,24 @@
-diff --git i/pc/libdb.pc w/pc/libdb.pc
-index 6a40e95..682c932 100644
---- i/pc/libdb.pc
-+++ w/pc/libdb.pc
-@@ -1,5 +1,11 @@
-+prefix=@db@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/lib
-+includedir=${prefix}/include
-+
- Name: libdb
- Description: libdb
- Requires:
- Version: 1
--Libs: -ldb
-+Libs: -L${libdir} -ldb
-+Cflags: -I${includedir}
-diff --git i/pc/libgif.pc w/pc/libgif.pc
-index cb154c9..24d8898 100644
---- i/pc/libgif.pc
-+++ w/pc/libgif.pc
-@@ -1,5 +1,11 @@
-+prefix=@giflib@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/lib
-+includedir=${prefix}/include
-+
- Name: libgif
- Description: libgif
- Requires:
- Version: 1
--Libs: -lgif
-+Libs: -L${libdir} -lgif
-+Cflags: -I${includedir}
-diff --git i/tmpdir/Makefile w/tmpdir/Makefile
-index d44adac..c0b361e 100644
---- i/tmpdir/Makefile
-+++ w/tmpdir/Makefile
-@@ -1,6 +1,6 @@
- MOD_HEADERS  := tmpdir.h
- MOD_SOURCES  := tmpdir.cpp
--SCRIPT_TESTS := tmpdir
-+#SCRIPT_TESTS := tmpdir
+diff --git a/programs/ms2render/ms2render.cpp b/programs/ms2render/ms2render.cpp
+index 6381e37..e36b79d 100644
+--- a/programs/ms2render/ms2render.cpp
++++ b/programs/ms2render/ms2render.cpp
+@@ -14,6 +14,7 @@
+ #include "geo_render/gobj_maps.h"
+ #include "geo_render/gobj_srtm.h"
+ //#include "draw_pulk_grid.h"
++#include "srtm/srtm.h"
+ #include "viewer/gobj_multi.h"
+ #include <cstring>
  
- PKG_CONFIG   := libzip
+@@ -126,9 +127,9 @@ main(int argc, char *argv[]){
+ 
+ 
+     // Srtm layer
+-    std::shared_ptr<SRTMSurf> s;
++    std::shared_ptr<SRTM> s;
+     if (O.exists("srtm")){
+-      s.reset(new SRTMSurf(O));
++      s.reset(new SRTM(O));
+       obj.add(5, std::shared_ptr<GObjSRTM>(new GObjSRTM(s.get(),O)));
+     }
  
diff --git a/pkgs/geospatial/mapsoft/2.nix b/pkgs/geospatial/mapsoft/2.nix
@@ -30,29 +30,25 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mapsoft2";
-  version = "2.3";
+  version = "2.4";
 
   src = fetchFromGitHub {
     owner = "slazav";
     repo = "mapsoft2";
     rev = "${finalAttrs.version}-alt1";
-    hash = "sha256-rhxz98NIrdC36yITmHiGQ1Ae1JrzQFn4HTB8VTVGvGY=";
+    hash = "sha256-XT3oDPu+GE3WfzlDk7jELhGmPknL0m+cgTxH4opGjFs=";
     fetchSubmodules = true;
   };
 
-  patches = [
-    (substituteAll {
-      src = ./0002-fix-build.patch;
-      db = db.dev;
-      inherit giflib;
-    })
-  ];
-  patchFlags = [
-    "-p1"
-    "-d modules"
-  ];
+  patches = [ ./0002-fix-build.patch ];
 
   postPatch = ''
+    substituteInPlace modules/getopt/Makefile \
+      --replace-fail "SCRIPT_TESTS := getopt" ""
+    substituteInPlace modules/opt/Makefile \
+      --replace-fail "SIMPLE_TESTS := opt" ""
+    substituteInPlace modules/tmpdir/Makefile \
+      --replace-fail "SCRIPT_TESTS := tmpdir" ""
     substituteInPlace modules/get_deps \
       --replace-fail "/usr/bin/perl" "${perlPackages.perl}/bin/perl"
     substituteInPlace modules/mapview/mapview.cpp \
@@ -93,6 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     db
+    giflib
     gsettings-desktop-schemas
     gtkmm3
     jansson
@@ -107,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
     shapelib
   ];
 
-  preBuild = "export SKIP_IMG_DIFFS=1";
+  SKIP_IMG_DIFFS = 1;
 
   makeFlags = [ "prefix=$(out)" ];