git.iko.soy/typeable/nixpkgs
on master help sign in
viking: 1.7 -> 1.8
commita1caeda72cf45ed1d3ea08619c4afa8889664638 authorNikolay Korotkiy <sikmir@gmail.com> dateTue 4 Feb 2020, 01:36 (7 years ago) parentca00a3f
1 file changed+33−10
pkgs/applications/misc/viking/default.nix+33−10
pkgs/applications/misc/viking/default.nix+33−10
@@ -1,24 +1,47 @@
1−{ fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk2, expat, curl
1+{ fetchurl, fetchpatch, stdenv, makeWrapper
2+, pkgconfig, intltool, gettext, gtk2, expat, curl
23, gpsd, bc, file, gnome-doc-utils, libexif, libxml2, libxslt, scrollkeeper
3−, docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect
4−, geoclue2, liboauth, nettle }:
4+, docbook_xml_dtd_412, gexiv2, gpsbabel, expect
5+, withMapnik ? false, mapnik
6+, withMBTiles ? true, sqlite
7+, withOAuth ? true, liboauth
8+, withMd5Hash ? true, nettle
9+, withGeoClue ? true, geoclue2 }:
510
611stdenv.mkDerivation rec {
712 pname = "viking";
8− version = "1.7";
13+ version = "1.8";
914
1015 src = fetchurl {
1116 url = "mirror://sourceforge/viking/viking/viking-${version}.tar.bz2";
12− sha256 = "092q2dv0rcz12nh2js1z1ralib1553dmzy9pdrvz9nv2vf61wybw";
17+ sha256 = "1a0g0fbj4q5s9p8fv0mqvxws10q3naj81l72sz30vvqpbz6vqp45";
1318 };
1419
20+ patches = [
21+ # Fix build without mapnik and sqlite https://github.com/viking-gps/viking/pull/79
22+ (fetchpatch {
23+ url = "https://github.com/viking-gps/viking/commit/995feefcb97bdb1590ed018224cf47ce197fe0c1.patch";
24+ sha256 = "1xb0b76kg690fag9mw3yfj5k766jmqp1sm8q4f29n1h3nz5g8izd";
25+ })
26+ ];
27+
1528 nativeBuildInputs = [ pkgconfig ];
1629 buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils
17− libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite
18− geoclue2 liboauth nettle
19− ];
30+ libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2
31+ ] ++ stdenv.lib.optional withMapnik mapnik
32+ ++ stdenv.lib.optional withGeoClue geoclue2
33+ ++ stdenv.lib.optional withMd5Hash nettle
34+ ++ stdenv.lib.optional withOAuth liboauth
35+ ++ stdenv.lib.optional withMBTiles sqlite;
2036
21− configureFlags = [ "--disable-scrollkeeper --disable-mapnik" ];
37+ configureFlags = [
38+ "--disable-scrollkeeper"
39+ (stdenv.lib.enableFeature withMapnik "mapnik")
40+ (stdenv.lib.enableFeature withGeoClue "geoclue")
41+ (stdenv.lib.enableFeature withMd5Hash "nettle")
42+ (stdenv.lib.enableFeature withOAuth "oauth")
43+ (stdenv.lib.enableFeature withMBTiles "mbtiles")
44+ ];
2245
2346 preBuild = ''
2447 sed -i help/Makefile \
@@ -45,7 +68,7 @@ stdenv.mkDerivation rec {
4568 '';
4669 homepage = https://sourceforge.net/projects/viking/;
4770 license = licenses.gpl2Plus;
48− maintainers = with maintainers; [ pSub ];
71+ maintainers = with maintainers; [ pSub sikmir ];
4972 platforms = with platforms; linux;
5073 };
5174}