diff --git a/flake.lock b/flake.lock
index 90dff6e0eaeb8aef1a627e5479944d9ae6ccb622..6aac3d89089e60a6980a7299a60c65bfe1035062 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@ }
},
"nixpkgs": {
"locked": {
"lastModified": 1735685343,
"narHash": "sha256-h1CpBzdJDNtSUb5QMyfFHKHocTTky+4McgQEBQBM+xA=",
"lastModified": 1735915915,
"narHash": "sha256-Q4HuFAvoKAIiTRZTUxJ0ZXeTC7lLfC9/dggGHNXNlCw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "81934660d6e9ea54d2f0cdee821e8533b10c221a",
"rev": "a27871180d30ebee8aa6b11bf7fef8a52f024733",
"type": "github"
},
"original": {
diff --git a/pkgs/data/dicts/tatoeba/default.nix b/pkgs/data/dicts/tatoeba/default.nix
index ac20944ce0a209ca00dfcd3d19e9b3ee90d829e4..2c00b2df2ef4671e465823aa22e55b18695765bf 100644
--- a/pkgs/data/dicts/tatoeba/default.nix
+++ b/pkgs/data/dicts/tatoeba/default.nix
@@ -45,7 +45,7 @@ tatoeba = builtins.fromJSON (builtins.readFile ./tatoeba.json);
in
stdenvNoCC.mkDerivation rec {
pname = "tatoeba";
srcs = lib.mapAttrsToList (name: spec: fetchurl spec) tatoeba;
diff --git a/pkgs/data/dicts/tatoeba/tatoeba.json b/pkgs/data/dicts/tatoeba/tatoeba.json
index 3e0882ebe7a814825074daa0b90acf36348c9da2..0b00d17d82e3ddad22bdb1e83111fbd8b52b4902 100644
--- a/pkgs/data/dicts/tatoeba/tatoeba.json
+++ b/pkgs/data/dicts/tatoeba/tatoeba.json
@@ -5,35 +5,35 @@ "hash": "sha256-lC+9/ZI3iwzOOFPzt3MHYTaytk090xa8LP73/1K3YPU="
},
"deu_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu_sentences_detailed.tsv.bz2",
},
"eng_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng_sentences_detailed.tsv.bz2",
},
"epo_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo_sentences_detailed.tsv.bz2",
},
"fin_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin_sentences_detailed.tsv.bz2",
},
"hye_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/hye/hye_sentences_detailed.tsv.bz2",
},
"rus_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus_sentences_detailed.tsv.bz2",
},
"swe_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe_sentences_detailed.tsv.bz2",
},
"ukr_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr_sentences_detailed.tsv.bz2",
},
"bel-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/bel/bel-eng_links.tsv.bz2",
@@ -45,15 +45,15 @@ "hash": "sha256-5B5oYEpkYzfIktaVR9yZtNFGAXP2v5+wVgcz+h1EO0c="
},
"deu-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-eng_links.tsv.bz2",
},
"deu-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-rus_links.tsv.bz2",
},
"eng-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-epo_links.tsv.bz2",
},
"eng-bel_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-bel_links.tsv.bz2",
@@ -61,39 +61,39 @@ "hash": "sha256-tnOHsCoU/nevl0VOfZ+dAEYH61Wgl5wfdSzJdvm7j7s="
},
"eng-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-deu_links.tsv.bz2",
},
"eng-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-fin_links.tsv.bz2",
},
"eng-hye_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-hye_links.tsv.bz2",
},
"eng-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-rus_links.tsv.bz2",
},
"eng-swe_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-swe_links.tsv.bz2",
},
"eng-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-ukr_links.tsv.bz2",
},
"epo-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-eng_links.tsv.bz2",
},
"epo-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-rus_links.tsv.bz2",
},
"fin-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-eng_links.tsv.bz2",
},
"fin-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-rus_links.tsv.bz2",
@@ -101,11 +101,11 @@ "hash": "sha256-4dbyxgjW58TOJmP6PvC/wr3Jc9HAz4JWFKQBK7R62s8="
},
"hye-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/hye/hye-eng_links.tsv.bz2",
},
"hye-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/hye/hye-rus_links.tsv.bz2",
},
"rus-bel_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-bel_links.tsv.bz2",
@@ -113,15 +113,15 @@ "hash": "sha256-HnzT3/MoMrPOobHshpbjv5C1cuOJ15GsKnBBxoUffZI="
},
"rus-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-deu_links.tsv.bz2",
},
"rus-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-eng_links.tsv.bz2",
},
"rus-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-epo_links.tsv.bz2",
},
"rus-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-fin_links.tsv.bz2",
@@ -129,7 +129,7 @@ "hash": "sha256-FWw1CWDD/prJeTYM4a4OhUb127fXULgV0cgAZfBrLqU="
},
"rus-hye_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-hye_links.tsv.bz2",
},
"rus-swe_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-swe_links.tsv.bz2",
@@ -137,11 +137,11 @@ "hash": "sha256-pQMFP3DKI4EjdkQAodLV5F06vvQjZ3BGZpOgH9QZrFw="
},
"rus-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-ukr_links.tsv.bz2",
},
"swe-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-eng_links.tsv.bz2",
},
"swe-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-rus_links.tsv.bz2",
@@ -149,10 +149,10 @@ "hash": "sha256-jnm0hXetMfvIt+lhEoJ8dgLL4+ZVs87R+GK2xkDNIvw="
},
"ukr-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-eng_links.tsv.bz2",
},
"ukr-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-rus_links.tsv.bz2",
}
}
diff --git a/pkgs/geospatial/mapsoft/0002-fix-build.patch b/pkgs/geospatial/mapsoft/0002-fix-build.patch
index 608ee44720f2fcd1b6d66878429227e8fd95b64d..b15461dbf3716add11320331279414e67b4bfe3e 100644
--- a/pkgs/geospatial/mapsoft/0002-fix-build.patch
+++ b/pkgs/geospatial/mapsoft/0002-fix-build.patch
@@ -1,5 +1,5 @@
diff --git i/docs/man/ms2render.htm w/docs/man/ms2render.htm
-index 652acc2..b5750c3 100644
+index 62972dc..0195402 100644
--- i/docs/man/ms2render.htm
+++ w/docs/man/ms2render.htm
@@ -493,7 +493,7 @@
@@ -21,7 +21,7 @@
diff --git i/docs/man/ms2view.htm w/docs/man/ms2view.htm
-index f178b4a..1fed011 100644
+index 243de0a..7138440 100644
--- i/docs/man/ms2view.htm
+++ w/docs/man/ms2view.htm
@@ -475,7 +475,7 @@
@@ -47,7 +47,7 @@ contains a few definitions, mostly for making interface elements smaller.
Some tips about viewer structure can be also find there.
B<$HOME/.mapsoft2/mapsoft2.css> -- user-specific file.
diff --git i/docs/man/ms2vmap.htm w/docs/man/ms2vmap.htm
-index 8bbeac9..f6ddd9a 100644
+index 901374e..6dce51b 100644
--- i/docs/man/ms2vmap.htm
+++ w/docs/man/ms2vmap.htm
@@ -64,7 +64,7 @@ ms2vmap <file> ... -o <out file> [<options>]
@@ -60,7 +60,7 @@
diff --git i/docs/man/ms2vmapdb.htm w/docs/man/ms2vmapdb.htm
-index 8bd5943..c990a0f 100644
+index 2b06fe4..2018bc6 100644
--- i/docs/man/ms2vmapdb.htm
+++ w/docs/man/ms2vmapdb.htm
@@ -238,7 +238,7 @@ ms2vmapdb fig_lib -- make fig library using typeinfo file
@@ -90,7 +90,7 @@ +File with type information. Default: @out@/share/mapsoft2/types.cfg
-@@ -646,7 +646,7 @@ ms2vmapdb fig_lib -- make fig library using typeinfo file
+@@ -652,7 +652,7 @@ ms2vmapdb fig_lib -- make fig library using typeinfo file
@@ -114,7 +114,7 @@
if (getenv("HOME")) {
AddSep("Maps");
diff --git i/modules/mapview/mapview.cpp w/modules/mapview/mapview.cpp
-index 6d461fb..5bd5367 100644
+index 997c127..43928bf 100644
--- i/modules/mapview/mapview.cpp
+++ w/modules/mapview/mapview.cpp
@@ -367,7 +367,7 @@ Mapview::load_css(){
@@ -127,7 +127,7 @@ if (file_exists(css_glo) &&
css_provider->load_from_path(css_glo)){
auto screen = get_screen();
diff --git i/modules/vmap2/vmap2gobj.cpp w/modules/vmap2/vmap2gobj.cpp
-index d6123a7..5c6198a 100644
+index 4b48cf8..724e444 100644
--- i/modules/vmap2/vmap2gobj.cpp
+++ w/modules/vmap2/vmap2gobj.cpp
@@ -22,7 +22,7 @@ using namespace std;
@@ -135,11 +135,11 @@ void
ms2opt_add_vmap2_render(GetOptSet & opts){
const char *g = "VMAP2_RENDER";
-+ opts.add("config", 1,'c',g, "Configuration file for vector map rendering. Default: @out/share/mapsoft2/render.cfg");
++ opts.add("config", 1,'c',g, "Configuration file for vector map rendering. Default: @out@/share/mapsoft2/render.cfg");
opts.add("define", 1,0,g, "Definitions for vector map rendering (json object)");
opts.add("obj_scale", 1,0,g, "Rescaling factor for all objects, default 1.0.");
opts.add("vmap_minsc", 1,0,g, "Minimum map scale (calculated from the 'natural' "
-@@ -92,7 +92,7 @@ GObjVMap2::GObjVMap2(VMap2 & map, const Opt &o): GObjMulti(false), map(map) {
+@@ -110,7 +110,7 @@ GObjVMap2::GObjVMap2(VMap2 & map, const Opt &o): GObjMulti(false), map(map) {
read_words_defs defs(o.get("define", Opt()));
int depth = 0;
@@ -168,114 +168,221 @@ if (file == "") return;
read_words_defs defs(o.get("define", Opt()));
load(file, defs);
diff --git i/vmap_data/scripts/vmaps.sh w/vmap_data/scripts/vmaps.sh
-index 989677f..af8fbd1 100644
+index 460533a..7591f33 100644
--- i/vmap_data/scripts/vmaps.sh
+++ w/vmap_data/scripts/vmaps.sh
-@@ -20,12 +20,12 @@ GRID=0; # draw grid
+@@ -16,8 +16,8 @@ MAP_ATTR="mapsoft"
-REND_CFG=/usr/share/mapsoft2/render.cfg; # Render configuration
-TYPEINFO=/usr/share/mapsoft2/types.cfg # Type information
--HTM_TEMPL=/usr/share/mapsoft2/map_templ.htm; # template for htm page
+REND_CFG=@out@/share/mapsoft2/render.cfg; # Render configuration
+TYPEINFO=@out@/share/mapsoft2/types.cfg # Type information
-+HTM_TEMPL=@out@/share/mapsoft2/map_templ.htm; # template for htm page
--TYPSRC=/usr/share/mapsoft2/typ.txt # typ file source for garmin IMG
-+TYPSRC=@out@/share/mapsoft2/typ.txt # typ file source for garmin IMG
+@@ -46,7 +46,7 @@ TLIST="";
+-TYPSRC=/usr/share/mapsoft2/typ.txt; # typ file source for garmin IMG
++TYPSRC=@out@/share/mapsoft2/typ.txt; # typ file source for garmin IMG
+diff --git i/vmap_data/scripts/vmaps_diff w/vmap_data/scripts/vmaps_diff
+index 136155e..0aa1ed0 100755
+--- i/vmap_data/scripts/vmaps_diff
++++ w/vmap_data/scripts/vmaps_diff
+@@ -4,7 +4,7 @@
+-. vmaps.sh ||:
++. @out@/bin/vmaps.sh ||:
diff --git i/vmap_data/scripts/vmaps_get_fig w/vmap_data/scripts/vmaps_get_fig
-index fca52c1..e0bce0c 100755
+index 0ba7b7f..5048bcb 100755
--- i/vmap_data/scripts/vmaps_get_fig
+++ w/vmap_data/scripts/vmaps_get_fig
@@ -9,7 +9,7 @@
##################################################
--. vmaps.sh
-+. @out@/bin/vmaps.sh
+-. vmaps.sh ||:
++. @out@/bin/vmaps.sh ||:
+diff --git i/vmap_data/scripts/vmaps_img w/vmap_data/scripts/vmaps_img
+index 1e0599c..84413bb 100755
+--- i/vmap_data/scripts/vmaps_img
++++ w/vmap_data/scripts/vmaps_img
+@@ -9,7 +9,7 @@
+-. vmaps.sh ||:
++. @out@/bin/vmaps.sh ||:
diff --git i/vmap_data/scripts/vmaps_in w/vmap_data/scripts/vmaps_in
-index 07f8ec0..a6679f9 100755
+index 4381dd7..cf9d9d9 100755
--- i/vmap_data/scripts/vmaps_in
+++ w/vmap_data/scripts/vmaps_in
@@ -9,7 +9,7 @@
##################################################
--. vmaps.sh
-+. @out@/bin/vmaps.sh
+-. vmaps.sh ||:
++. @out@/bin/vmaps.sh ||:
-diff --git i/vmap_data/scripts/vmaps_mbtiles w/vmap_data/scripts/vmaps_mbtiles
-index d751d1c..2ab5945 100755
---- i/vmap_data/scripts/vmaps_mbtiles
-+++ w/vmap_data/scripts/vmaps_mbtiles
-@@ -8,7 +8,7 @@
+diff --git i/vmap_data/scripts/vmaps_index w/vmap_data/scripts/vmaps_index
+index ae225ec..e59c592 100755
+--- i/vmap_data/scripts/vmaps_index
++++ w/vmap_data/scripts/vmaps_index
+@@ -4,7 +4,7 @@
--. vmaps.sh
-+. @out@/bin/vmaps.sh
+-. vmaps.sh ||:
++. @out@/bin/vmaps.sh ||:
diff --git i/vmap_data/scripts/vmaps_out w/vmap_data/scripts/vmaps_out
-index bd1d183..1a47f3a 100755
+index d1d7903..d4d5318 100755
--- i/vmap_data/scripts/vmaps_out
+++ w/vmap_data/scripts/vmaps_out
-@@ -12,7 +12,7 @@
+@@ -18,7 +18,7 @@
+-. vmaps.sh ||:
++. @out@/bin/vmaps.sh ||:
+diff --git i/vmap_data/scripts/vmaps_pack_img w/vmap_data/scripts/vmaps_pack_img
+index a91fc99..a692600 100755
+--- i/vmap_data/scripts/vmaps_pack_img
++++ w/vmap_data/scripts/vmaps_pack_img
+@@ -5,7 +5,7 @@
+-. vmaps.sh ||:
++. @out@/bin/vmaps.sh ||:
+diff --git i/vmap_data/scripts/vmaps_pack_mbtiles w/vmap_data/scripts/vmaps_pack_mbtiles
+index b73121e..da52332 100755
+--- i/vmap_data/scripts/vmaps_pack_mbtiles
++++ w/vmap_data/scripts/vmaps_pack_mbtiles
+@@ -7,7 +7,7 @@
+-. vmaps.sh ||:
++. @out@/bin/vmaps.sh ||:
+diff --git i/vmap_data/scripts/vmaps_pack_sqlitedb w/vmap_data/scripts/vmaps_pack_sqlitedb
+index 3dfd676..9b4887b 100755
+--- i/vmap_data/scripts/vmaps_pack_sqlitedb
++++ w/vmap_data/scripts/vmaps_pack_sqlitedb
+@@ -7,7 +7,7 @@
+-. vmaps.sh ||:
++. @out@/bin/vmaps.sh ||:
+diff --git i/vmap_data/scripts/vmaps_png w/vmap_data/scripts/vmaps_png
+index 5fbf71c..f726bdb 100755
+--- i/vmap_data/scripts/vmaps_png
++++ w/vmap_data/scripts/vmaps_png
+@@ -9,7 +9,7 @@
##################################################
--. vmaps.sh
-+. @out@/bin/vmaps.sh
+-. vmaps.sh ||:
++. @out@/bin/vmaps.sh ||:
diff --git i/vmap_data/scripts/vmaps_preview w/vmap_data/scripts/vmaps_preview
-index 757dacc..4a7612c 100755
+index 1ed94bc..be42a26 100755
--- i/vmap_data/scripts/vmaps_preview
+++ w/vmap_data/scripts/vmaps_preview
@@ -3,7 +3,7 @@
##################################################
--. vmaps.sh
-+. @out@/bin/vmaps.sh
+-. vmaps.sh ||:
++. @out@/bin/vmaps.sh ||:
-diff --git i/vmap_data/scripts/vmaps_sqlitedb w/vmap_data/scripts/vmaps_sqlitedb
-index 70a3d6b..e683232 100755
---- i/vmap_data/scripts/vmaps_sqlitedb
-+++ w/vmap_data/scripts/vmaps_sqlitedb
-@@ -6,7 +6,7 @@
+diff --git i/vmap_data/scripts/vmaps_rend_mbtiles w/vmap_data/scripts/vmaps_rend_mbtiles
+index a8ffee0..4809371 100755
+--- i/vmap_data/scripts/vmaps_rend_mbtiles
++++ w/vmap_data/scripts/vmaps_rend_mbtiles
+@@ -9,7 +9,7 @@
+-. vmaps.sh ||:
++. @out@/bin/vmaps.sh ||:
+diff --git i/vmap_data/scripts/vmaps_tiles w/vmap_data/scripts/vmaps_tiles
+index fc45eab..3a06f66 100755
+--- i/vmap_data/scripts/vmaps_tiles
++++ w/vmap_data/scripts/vmaps_tiles
+@@ -9,7 +9,7 @@
+-. vmaps.sh ||:
++. @out@/bin/vmaps.sh ||:
+diff --git i/vmap_data/scripts/vmaps_tlist w/vmap_data/scripts/vmaps_tlist
+index 6aff657..1b7df8c 100755
+--- i/vmap_data/scripts/vmaps_tlist
++++ w/vmap_data/scripts/vmaps_tlist
+@@ -3,7 +3,7 @@
--. vmaps.sh
-+. @out@/bin/vmaps.sh
+-. vmaps.sh ||:
++. @out@/bin/vmaps.sh ||:
diff --git i/vmap_data/scripts/vmaps_wp_update w/vmap_data/scripts/vmaps_wp_update
-index 667057e..5ac21d7 100755
+index 24df3c1..5252dd0 100755
--- i/vmap_data/scripts/vmaps_wp_update
+++ w/vmap_data/scripts/vmaps_wp_update
-@@ -12,7 +12,7 @@
+@@ -25,7 +25,7 @@
##################################################
--. vmaps.sh
-+. @out@/bin/vmaps.sh
+-. vmaps.sh ||:
++. @out@/bin/vmaps.sh ||:
diff --git a/pkgs/geospatial/mapsoft/0003-notests.patch b/pkgs/geospatial/mapsoft/0003-notests.patch
new file mode 100644
index 0000000000000000000000000000000000000000..433150c4a472303d74a842def7283712963eddc3
--- /dev/null
+++ b/pkgs/geospatial/mapsoft/0003-notests.patch
@@ -0,0 +1,13 @@
+diff --git i/programs/Makefile w/programs/Makefile
+index d8f2824..22f7430 100644
+--- i/programs/Makefile
++++ w/programs/Makefile
+@@ -17,7 +17,7 @@ bindir ?= $(prefix)/bin
+- sh -e -c 'for i in $(PROGRAMS); do make -C $$i; done'
++ sh -e -c 'for i in $(PROGRAMS); do make -C $$i notests; done'
diff --git a/pkgs/geospatial/mapsoft/2.nix b/pkgs/geospatial/mapsoft/2.nix
index e1d859fc63a2badb51216468cc993ea68aec731a..ff7eb8e59739250a1ae81c0af9e3ac1fb7c45d41 100644
--- a/pkgs/geospatial/mapsoft/2.nix
+++ b/pkgs/geospatial/mapsoft/2.nix
@@ -3,9 +3,7 @@ lib,
stdenv,
fetchFromGitHub,
substituteAll,
desktopToDarwinBundle,
db,
fig2dev,
giflib,
@@ -25,23 +23,24 @@ perlPackages,
pkg-config,
proj,
shapelib,
unzip,
wrapGAppsHook,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "mapsoft2";
src = fetchFromGitHub {
owner = "slazav";
repo = "mapsoft2";
tag = finalAttrs.version;
fetchSubmodules = true;
};
postPatch =
let
@@ -56,42 +55,34 @@ "modules/mapview/mapview.cpp"
"modules/vmap2/vmap2gobj.cpp"
"modules/vmap2/vmap2types.cpp"
"vmap_data/scripts/vmaps.sh"
"vmap_data/scripts/vmaps_diff"
"vmap_data/scripts/vmaps_get_fig"
"vmap_data/scripts/vmaps_img"
"vmap_data/scripts/vmaps_in"
"vmap_data/scripts/vmaps_mbtiles"
"vmap_data/scripts/vmaps_index"
"vmap_data/scripts/vmaps_out"
"vmap_data/scripts/vmaps_pack_img"
"vmap_data/scripts/vmaps_pack_mbtiles"
"vmap_data/scripts/vmaps_pack_sqlitedb"
"vmap_data/scripts/vmaps_png"
"vmap_data/scripts/vmaps_preview"
"vmap_data/scripts/vmaps_sqlitedb"
"vmap_data/scripts/vmaps_rend_mbtiles"
"vmap_data/scripts/vmaps_tiles"
"vmap_data/scripts/vmaps_tlist"
"vmap_data/scripts/vmaps_wp_update"
];
in
''
${lib.concatStringsSep "\n" (map (file: ''substituteInPlace ${file} --subst-var out'') srcFiles)}
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/image_cnt/image_cnt.cpp --replace-fail "(pow," "pow("
patchShebangs .
'';
name = "ms2view";
exec = "ms2view";
comment = "Viewer for geodata and raster maps";
desktopName = "ms2view";
genericName = "Mapsoft2 viewer";
categories = [
"Geography"
"Geoscience"
"Science"
];
nativeBuildInputs = [
fig2dev
imagemagick
perlPackages.perl
@@ -115,6 +106,7 @@ libxml2
libzip
proj
shapelib
] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
env = {
@@ -123,7 +115,11 @@ NIX_CFLAGS_COMPILE = "-std=c++17";
NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-liconv";
};
makeFlags = [ "prefix=$(out)" ];
dontWrapGApps = true;
application/octet-stream
This content has been proxied by September (3851b).