diff options
author | Pascal Wittmann <mail@pascal-wittmann.de> | 2015-09-06 21:43:27 +0200 |
---|---|---|
committer | Pascal Wittmann <mail@pascal-wittmann.de> | 2015-09-06 21:44:05 +0200 |
commit | 73db5b25714b9353bc90c91f8ad753f28c8baff8 (patch) | |
tree | 47236027ae51cf0fad30a4b31ebd88f67ee65172 /pkgs/applications/misc/viking | |
parent | fa6a1980d94813a99bd3a3619ad083a781cced20 (diff) | |
download | nixlib-73db5b25714b9353bc90c91f8ad753f28c8baff8.tar nixlib-73db5b25714b9353bc90c91f8ad753f28c8baff8.tar.gz nixlib-73db5b25714b9353bc90c91f8ad753f28c8baff8.tar.bz2 nixlib-73db5b25714b9353bc90c91f8ad753f28c8baff8.tar.lz nixlib-73db5b25714b9353bc90c91f8ad753f28c8baff8.tar.xz nixlib-73db5b25714b9353bc90c91f8ad753f28c8baff8.tar.zst nixlib-73db5b25714b9353bc90c91f8ad753f28c8baff8.zip |
viking: update from 1.3 to 1.6
Diffstat (limited to 'pkgs/applications/misc/viking')
-rw-r--r-- | pkgs/applications/misc/viking/default.nix | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index 9afabe0372d1..19fd910195fa 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -1,33 +1,37 @@ -{ fetchurl, stdenv, pkgconfig, intltool, gettext, gtk, expat, curl +{ fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk, expat, curl , gpsd, bc, file, gnome_doc_utils, libexif, libxml2, libxslt, scrollkeeper -, docbook_xml_dtd_412 }: +, docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel }: -let version = "1.3"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "viking-${version}"; + version = "1.6"; src = fetchurl { - url = "mirror://sourceforge/viking/viking/${version}/viking-${version}.tar.gz"; - sha256 = "1psgy1myx9xn7zgpvqrpricsv041sz41mm82hj5i28k72fq47p2l"; + url = "mirror://sourceforge/viking/viking/viking-${version}.tar.bz2"; + sha256 = "02ljnnc1in3cnafmld93qvzgx3j4qsgac2a53q18s6sp5hvvvw91"; }; - buildInputs = - [ pkgconfig intltool gettext gtk expat curl gpsd bc file gnome_doc_utils - libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 - ]; + buildInputs = [ makeWrapper pkgconfig intltool gettext gtk expat curl gpsd bc file gnome_doc_utils + libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite + ]; - configureFlags = [ "--disable-scrollkeeper" ]; + configureFlags = [ "--disable-scrollkeeper --disable-mapnik" ]; - preBuild = - '' sed -i help/Makefile \ - -e 's|--noout|--noout --nonet --path "${scrollkeeper}/share/xml/scrollkeeper/dtds"|g' - ''; + preBuild = '' + sed -i help/Makefile \ + -e 's|--noout|--noout --nonet --path "${scrollkeeper}/share/xml/scrollkeeper/dtds"|g' + sed -i help/Makefile -e 's|--postvalid||g' + ''; doCheck = true; - meta = { - description = "GPS data editor and analyzer"; + postInstall = '' + wrapProgram $out/bin/viking \ + --prefix PATH : "${gpsbabel}/bin" + ''; + meta = with stdenv.lib; { + description = "GPS data editor and analyzer"; longDescription = '' Viking is a free/open source program to manage GPS data. You can import and plot tracks and waypoints, show Openstreetmaps @@ -35,9 +39,8 @@ stdenv.mkDerivation { on the map, make new tracks and waypoints, see real-time GPS position, etc. ''; - homepage = http://viking.sourceforge.net/; - - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ pSub ]; }; } |