From f79fde1ca4da148fd7a440d376e85b6670d4560d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 24 Sep 2017 21:04:04 +0200 Subject: [PATCH 1/2] routino: init at 3.2 --- pkgs/tools/misc/routino/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/misc/routino/default.nix diff --git a/pkgs/tools/misc/routino/default.nix b/pkgs/tools/misc/routino/default.nix new file mode 100644 index 00000000000..2629b8fd5d8 --- /dev/null +++ b/pkgs/tools/misc/routino/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, perl, zlib, bzip2 }: + +stdenv.mkDerivation rec { + name = "Routino-${version}"; + version = "3.2"; + + src = fetchurl { + url = "http://routino.org/download/routino-${version}.tgz"; + sha256 = "0lkmpi8gn7qf40cx93jcp7nxa9dfwi1d6rjrhcqbdymszzm33972"; + }; + + nativeBuildInputs = [ perl ]; + buildInputs = [ zlib bzip2 ]; + + installFlags = [ "prefix=$(out)" ]; + + meta = with stdenv.lib; { + homepage = http://www.routino.org/; + description = "OpenStreetMap Routing Software"; + license = licenses.agpl3; + maintainter = with maintainers; [ dotlambda ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4324cc0092f..10455175412 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4179,6 +4179,8 @@ with pkgs; rnv = callPackage ../tools/text/xml/rnv { }; + routino = callPackage ../tools/misc/routino { }; + rq = callPackage ../development/tools/rq { v8 = v8_static; }; From 0395a0d10bd1a47db0592047a668b9334af60a4f Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Thu, 28 Sep 2017 17:29:49 +0000 Subject: [PATCH 2/2] routino: fix data path --- pkgs/tools/misc/routino/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/routino/default.nix b/pkgs/tools/misc/routino/default.nix index 2629b8fd5d8..e3e174e0204 100644 --- a/pkgs/tools/misc/routino/default.nix +++ b/pkgs/tools/misc/routino/default.nix @@ -1,18 +1,21 @@ { stdenv, fetchurl, perl, zlib, bzip2 }: stdenv.mkDerivation rec { - name = "Routino-${version}"; + name = "routino-${version}"; version = "3.2"; src = fetchurl { - url = "http://routino.org/download/routino-${version}.tgz"; + url = "http://routino.org/download/${name}.tgz"; sha256 = "0lkmpi8gn7qf40cx93jcp7nxa9dfwi1d6rjrhcqbdymszzm33972"; }; nativeBuildInputs = [ perl ]; + buildInputs = [ zlib bzip2 ]; - installFlags = [ "prefix=$(out)" ]; + outputs = [ "out" "doc" ]; + + makeFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { homepage = http://www.routino.org/;