nur-packages

commit 300149339e83d6eff615d5421d83e2c4e05d11d0
parent ba27eb8c5b22f241e8b815d8d3395c2331587a50
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date:   Thu, 23 Jan 2020 22:08:34 +0300

Update mapsoft

Diffstat:
M
nix/sources.json
 | 
6
+++---
M
pkgs/mapsoft/0001-fix-build.patch
 | 
12
------------

2 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/nix/sources.json b/nix/sources.json
@@ -221,10 +221,10 @@
         "homepage": "http://slazav.mccme.ru/prog/mapsoft.htm",
         "owner": "ushakov",
         "repo": "mapsoft",
-        "rev": "23bd02a05ecf86280acbc2f836803699fa6b13b9",
-        "sha256": "0rq71l9ma82h8rabg1frcxmbpvxqsqnxfixphqmdjybrhxmq2921",
+        "rev": "904e2da8a55e8426a56de7e41b06cb92e1656005",
+        "sha256": "1hs5nlb6jrvfjvwi34wzxqrm8bix365q7f169wix1nw0ngfcpjw3",
         "type": "tarball",
-        "url": "https://github.com/ushakov/mapsoft/archive/23bd02a05ecf86280acbc2f836803699fa6b13b9.tar.gz",
+        "url": "https://github.com/ushakov/mapsoft/archive/904e2da8a55e8426a56de7e41b06cb92e1656005.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "mbtileserver": {
diff --git a/pkgs/mapsoft/0001-fix-build.patch b/pkgs/mapsoft/0001-fix-build.patch
@@ -62,15 +62,3 @@ index fe5f1802..7238c176 100644
  env.UseLibs('glibmm-2.4 gtkmm-2.4 gthread-2.0')
  env.UseLibs('cairomm-1.0 pixman-1 freetype2 libusb-1.0')
  
-diff --git i/vector/vmap3/SConscript w/vector/vmap3/SConscript
-index 539f01c3..bbc4cade 100644
---- i/vector/vmap3/SConscript
-+++ w/vector/vmap3/SConscript
-@@ -7,4 +7,7 @@ env.Program("vmap_fix_diff.cpp")
- 
- env.Install(env.bindir, Split("""
-   vmap_render
-+  vmap_mmb_filter
-+  vmap_1km_filter
-+  vmap_fix_diff
- """))