1 files changed, 16 insertions, 17 deletions
diff --git a/pkgs/applications/misc/mkgmap/splitter/default.nix b/pkgs/applications/misc/mkgmap/splitter/default.nix
index 6baf4f763070..eabc0601cfab 100644
--- a/pkgs/applications/misc/mkgmap/splitter/default.nix
+++ b/pkgs/applications/misc/mkgmap/splitter/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv
 , fetchurl
-, fetchsvn
+, substituteAll
 , jdk
 , jre
 , ant
@@ -8,34 +8,30 @@
 , doCheck ? true
 }:
 let
-  version = "597";
-  sha256 = "1al3160amw0gdarrc707dsppm0kcai9mpkfak7ffspwzw9alsndx";
-
   deps = import ../deps.nix { inherit fetchurl; };
   testInputs = import ./testinputs.nix { inherit fetchurl; };
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "splitter";
-  inherit version;
+  version = "597";
 
-  src = fetchsvn {
-    inherit sha256;
-    url = "https://svn.mkgmap.org.uk/mkgmap/splitter/trunk";
-    rev = version;
+  src = fetchurl {
+    url = "http://www.mkgmap.org.uk/download/splitter-r${version}-src.tar.gz";
+    sha256 = "0d928wvlpzqwdpfksmxyyfkqrhjsij21wx2538bs2i29siwyla61";
   };
 
   patches = [
-    # Disable automatic download of dependencies
-    ./build.xml.patch
+    (substituteAll {
+      # Disable automatic download of dependencies
+      src = ./build.xml.patch;
+      inherit version;
+    })
 
     # Fix func.SolverAndProblemGeneratorTest test
     ./fix-failing-test.patch
   ];
 
   postPatch = with deps; ''
-    substituteInPlace build.xml \
-      --subst-var-by version ${version}
-
     mkdir -p lib/compile
     cp ${fastutil} lib/compile/${fastutil.name}
     cp ${osmpbf} lib/compile/${osmpbf.name}
@@ -61,16 +57,19 @@ stdenv.mkDerivation {
   checkPhase = "ant run.tests && ant run.func-tests";
 
   installPhase = ''
-    install -Dm644 dist/splitter.jar $out/share/java/splitter/splitter.jar
-    install -Dm644 doc/splitter.1 $out/share/man/man1/splitter.1
+    install -Dm644 dist/splitter.jar -t $out/share/java/splitter
+    install -Dm644 doc/splitter.1 -t $out/share/man/man1
     cp -r dist/lib/ $out/share/java/splitter/
     makeWrapper ${jre}/bin/java $out/bin/splitter \
       --add-flags "-jar $out/share/java/splitter/splitter.jar"
   '';
 
+  passthru.updateScript = [ ../update.sh "mkgmap-splitter" meta.downloadPage ];
+
   meta = with lib; {
     description = "Utility for splitting OpenStreetMap maps into tiles";
     homepage = "http://www.mkgmap.org.uk";
+    downloadPage = "http://www.mkgmap.org.uk/download/splitter.html";
     license = licenses.gpl2Only;
     maintainers = with maintainers; [ sikmir ];
     platforms = platforms.all;