alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

viking: update from 1.3 to 1.6

Browse source
This commit is contained in:
Pascal Wittmann 2015-09-06 21:43:27 +02:00
parent fa6a1980d9
commit 73db5b2571
2 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
pkgs/applications/misc/viking/default.nix
View file

@ -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 , 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 rec {
stdenv.mkDerivation {
name = "viking-${version}"; name = "viking-${version}";
version = "1.6";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/viking/viking/${version}/viking-${version}.tar.gz"; url = "mirror://sourceforge/viking/viking/viking-${version}.tar.bz2";
sha256 = "1psgy1myx9xn7zgpvqrpricsv041sz41mm82hj5i28k72fq47p2l"; sha256 = "02ljnnc1in3cnafmld93qvzgx3j4qsgac2a53q18s6sp5hvvvw91";
}; };
buildInputs = buildInputs = [ makeWrapper pkgconfig intltool gettext gtk expat curl gpsd bc file gnome_doc_utils
[ pkgconfig intltool gettext gtk expat curl gpsd bc file gnome_doc_utils libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite
libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 ];
];
configureFlags = [ "--disable-scrollkeeper" ]; configureFlags = [ "--disable-scrollkeeper --disable-mapnik" ];
preBuild = preBuild = ''
'' sed -i help/Makefile \ sed -i help/Makefile \
-e 's|--noout|--noout --nonet --path "${scrollkeeper}/share/xml/scrollkeeper/dtds"|g' -e 's|--noout|--noout --nonet --path "${scrollkeeper}/share/xml/scrollkeeper/dtds"|g'
''; sed -i help/Makefile -e 's|--postvalid||g'
'';
doCheck = true; doCheck = true;
meta = { postInstall = ''
description = "GPS data editor and analyzer"; wrapProgram $out/bin/viking \
--prefix PATH : "${gpsbabel}/bin"
'';
meta = with stdenv.lib; {
description = "GPS data editor and analyzer";
longDescription = '' longDescription = ''
Viking is a free/open source program to manage GPS data. You Viking is a free/open source program to manage GPS data. You
can import and plot tracks and waypoints, show Openstreetmaps 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 on the map, make new tracks and waypoints, see real-time GPS
position, etc. position, etc.
''; '';
homepage = http://viking.sourceforge.net/; homepage = http://viking.sourceforge.net/;
license = licenses.gpl2Plus;
license = stdenv.lib.licenses.gpl2Plus; maintainers = with maintainers; [ pSub ];
}; };
} }

1
pkgs/top-level/all-packages.nix
View file

@ -3322,6 +3322,7 @@ let
viking = callPackage ../applications/misc/viking { viking = callPackage ../applications/misc/viking {
inherit (gnome) scrollkeeper; inherit (gnome) scrollkeeper;
inherit (gnome3) gexiv2;
}; };
vnc2flv = callPackage ../tools/video/vnc2flv {}; vnc2flv = callPackage ../tools/video/vnc2flv {};