nur-packages

commit c4ac836c2eede11b2a313408b95cc59e581a4bf1
parent db76bccc97d8bfc8e40587ec9dd92ad4db41e4a8
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date:   Fri,  4 Sep 2020 00:15:39 +0300

taginfo-tools: fix build

Diffstat:
M
nix/sources.json
 | 
14
--------------
M
pkgs/tools/geo/taginfo-tools/default.nix
 | 
25
+++++++++++++++----------

2 files changed, 15 insertions(+), 24 deletions(-)
diff --git a/nix/sources.json b/nix/sources.json
@@ -813,20 +813,6 @@
         "url": "https://github.com/selectel/supload/archive/70690682867713c68d7c6daa833a1013e79df407.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
-    "taginfo-tools": {
-        "branch": "master",
-        "builtin": false,
-        "date": "2020-08-27T15:48:22Z",
-        "description": "C++ tools used in taginfo processing",
-        "homepage": "https://wiki.openstreetmap.org/wiki/Taginfo",
-        "owner": "taginfo",
-        "repo": "taginfo-tools",
-        "rev": "794d5edc272efaaf5381e7ef513a630ddd4a13ec",
-        "sha256": "0wjkxg2wqbh7vzq9nzmvaq2h2zkm3khnj5dlyglvn4wkn4xw5fp6",
-        "type": "tarball",
-        "url": "https://github.com/taginfo/taginfo-tools/archive/794d5edc272efaaf5381e7ef513a630ddd4a13ec.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
     "tilesets-cli": {
         "branch": "master",
         "builtin": false,
diff --git a/pkgs/tools/geo/taginfo-tools/default.nix b/pkgs/tools/geo/taginfo-tools/default.nix
@@ -1,24 +1,29 @@
-{ stdenv, cmake, bzip2, expat, gd, icu, libosmium, protozero, sparsehash, sqlite, zlib, sources }:
-let
-  pname = "taginfo-tools";
-  date = stdenv.lib.substring 0 10 sources.taginfo-tools.date;
-  version = "unstable-" + date;
-in
+{ stdenv, fetchFromGitHub, cmake, bzip2, expat, gd, icu, libosmium, protozero, sqlite, zlib, sources }:
+
 stdenv.mkDerivation {
-  inherit pname version;
-  src = sources.taginfo-tools;
+  pname = "taginfo-tools";
+  version = "unstable-2020-08-27";
+
+  src = fetchFromGitHub {
+    owner = "taginfo";
+    repo = "taginfo-tools";
+    rev = "794d5edc272efaaf5381e7ef513a630ddd4a13ec";
+    sha256 = "05xcqrmm8hzhgbjlyiakzggqjnzbhkdz6qhr7m81mkz3gp0wxffp";
+    fetchSubmodules = true;
+  };
 
   cmakeFlags = stdenv.lib.optional stdenv.isDarwin "-DCMAKE_FIND_FRAMEWORK=LAST";
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ bzip2 expat gd icu libosmium protozero sparsehash sqlite zlib ];
+  buildInputs = [ bzip2 expat gd icu libosmium protozero sqlite zlib ];
 
   postInstall = ''
     install -Dm755 src/{osmstats,taginfo-sizes} -t $out/bin
   '';
 
   meta = with stdenv.lib; {
-    inherit (sources.taginfo-tools) description homepage;
+    description = "C++ tools used in taginfo processing";
+    homepage = "https://wiki.openstreetmap.org/wiki/Taginfo";
     license = licenses.gpl3Plus;
     maintainers = [ maintainers.sikmir ];
     platforms = platforms.unix;