nur-packages

commit 969fd004f21953c7b22656ea146cb3fc8c4aa689
parent b7d1e2ee2f084bd0e1f392cc28f4c45c52b7e6dc
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date:   Mon,  5 Aug 2024 03:30:09 +0400

Up

Diffstat:
M
pkgs/data/maps/slazav/hr.nix
 | 
31
++++++++++++++++++++++++-------
M
pkgs/data/maps/slazav/podm.nix
 | 
31
++++++++++++++++++++++++-------

2 files changed, 48 insertions(+), 14 deletions(-)
diff --git a/pkgs/data/maps/slazav/hr.nix b/pkgs/data/maps/slazav/hr.nix
@@ -4,38 +4,55 @@
   fetchFromGitHub,
   bc,
   cgpsmapper,
+  git,
   gmaptool,
+  libjpeg,
   mapsoft2,
+  netpbm,
+  sqlite,
+  zip,
 }:
 
 stdenv.mkDerivation {
   pname = "slazav-hr";
-  version = "2021-02-07";
+  version = "2024-08-03";
 
   src = fetchFromGitHub {
     owner = "slazav";
     repo = "map_hr";
-    rev = "f476649b5ff12fb6fa037e6fb023c1da19639b84";
-    sha256 = "0z2782smylf62ank8bpdhnvldqy46xai8ahg87yfyl203zcpp07h";
+    rev = "d65d437f4cb9a450538c17778f22f9e129773c39";
+    hash = "sha256-P+H6vXL+lvebhpup5KH6l5HZQiwPKvhCR8YsOmcItFE=";
+    leaveDotGit = true;
   };
 
   nativeBuildInputs = [
     bc
     cgpsmapper
+    git
     gmaptool
+    libjpeg
     mapsoft2
+    netpbm
+    sqlite
+    zip
   ];
 
+  preBuild = ''
+    export HOME=$TMPDIR
+  '';
+
   buildFlags = [
-    "directories"
-    "reg_img"
+    "in"
+    "out"
   ];
 
-  installPhase = "install -Dm644 OUT/all_*.img -t $out";
+  installPhase = ''
+    install -Dm644 OUT/* -t $out
+  '';
 
   meta = {
     description = "Slazav mountains";
-    homepage = "http://slazav.xyz/maps/";
+    homepage = "https://slazav.xyz/maps/hr.htm";
     license = lib.licenses.free;
     maintainers = [ lib.maintainers.sikmir ];
     platforms = lib.platforms.all;
diff --git a/pkgs/data/maps/slazav/podm.nix b/pkgs/data/maps/slazav/podm.nix
@@ -4,38 +4,55 @@
   fetchFromGitHub,
   bc,
   cgpsmapper,
+  git,
   gmaptool,
+  libjpeg,
   mapsoft2,
+  netpbm,
+  sqlite,
+  zip,
 }:
 
 stdenv.mkDerivation {
   pname = "slazav-podm";
-  version = "2021-01-09";
+  version = "2024-06-16";
 
   src = fetchFromGitHub {
     owner = "slazav";
     repo = "map_podm";
-    rev = "c95a381155986f9f621e5d26b21bda041ad8c24f";
-    sha256 = "0jsrjzmg23rp3ay5149llqrq6pnr66wf7siphwn7gisz5g60pgpf";
+    rev = "f6357a7379567d5997325fd0f5b2078c327096f8";
+    hash = "sha256-j71hgn0ISol8Cna0EQgY18z182YZmMLyH2UIYwmamK8=";
+    leaveDotGit = true;
   };
 
   nativeBuildInputs = [
     bc
     cgpsmapper
+    git
     gmaptool
+    libjpeg
     mapsoft2
+    netpbm
+    sqlite
+    zip
   ];
 
+  preBuild = ''
+    export HOME=$TMPDIR
+  '';
+
   buildFlags = [
-    "directories"
-    "reg_img"
+    "in"
+    "out"
   ];
 
-  installPhase = "install -Dm644 OUT/all_*.img -t $out";
+  installPhase = ''
+    install -Dm644 OUT/* -t $out
+  '';
 
   meta = {
     description = "Slazav Moscow region map";
-    homepage = "http://slazav.xyz/maps/";
+    homepage = "https://slazav.xyz/maps/podm.htm";
     license = lib.licenses.free;
     maintainers = [ lib.maintainers.sikmir ];
     platforms = lib.platforms.all;