nur-packages

commit 3a8d8949a7bf8bd5b0aa1282a5983b352f04a713
parent c87d49cc65c6be887cf2198ca1e60dba48266b53
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date:   Sat, 21 Nov 2020 10:27:56 +0300

ocad2img: fetch sources from web archive

Diffstat:
M
pkgs/default.nix
 | 
2
+-
M
pkgs/tools/geo/ocad2img/default.nix
 | 
14
++++++++------

2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -156,7 +156,7 @@ lib.makeScope newScope (
     morse-talk = callPackage ./tools/morse-talk { };
     musig = callPackage ./tools/audio/musig { };
     ocad2img = perlPackages.callPackage ./tools/geo/ocad2img {
-      inherit cgpsmapper ocad2mp;
+      inherit cgpsmapper ocad2mp fetchwebarchive;
     };
     ocad2mp = callPackage ./tools/geo/ocad2mp { };
     odict = callPackage ./tools/dict/odict { };
diff --git a/pkgs/tools/geo/ocad2img/default.nix b/pkgs/tools/geo/ocad2img/default.nix
@@ -1,18 +1,20 @@
-{ stdenv, buildPerlPackage, fetchzip, dos2unix, cgpsmapper, ocad2mp, ModulePluggable, Tk }:
+{ stdenv, buildPerlPackage, fetchwebarchive, unzip, dos2unix, cgpsmapper, ocad2mp, ModulePluggable, Tk }:
 
 buildPerlPackage {
   pname = "ocad2img";
   version = "unstable-2009-10-11";
 
-  src = fetchzip {
+  src = fetchwebarchive {
     url = "http://worldofo.com/div/ocad2img.zip";
-    sha256 = "0d5aryahl5662w65fpqa5camq1c0wlyrnxgsdqb7xsgmk1sivvmz";
-    stripRoot = false;
+    timestamp = "20150326063156";
+    sha256 = "1w68jww1kyy2cdzc8b69pca5w05gxj8q3ap5q0ff10ix0sfcm0mn";
   };
 
+  sourceRoot = ".";
+
   outputs = [ "out" ];
 
-  nativeBuildInputs = [ dos2unix ];
+  nativeBuildInputs = [ unzip dos2unix ];
 
   propagatedBuildInputs = [ ModulePluggable Tk ];
 
@@ -41,7 +43,7 @@ buildPerlPackage {
   meta = with stdenv.lib; {
     description = "Converter from OCAD map format to Garmin format";
     homepage = "http://news.worldofo.com/2009/10/11/howto-convert-any-orienteering-map-to-a-garmin-map/";
-    license = licenses.gpl3;
+    license = licenses.gpl3Plus;
     maintainers = [ maintainers.sikmir ];
     platforms = platforms.linux;
     skip.ci = stdenv.isDarwin;