viking: 1.8 → 1.9

This commit is contained in:
Nikolay Korotkiy 2021-04-05 20:55:31 +03:00
parent 83c63225fe
commit 93a484f72b
No known key found for this signature in database
GPG key ID: D1DE6D7F693663A5
2 changed files with 33 additions and 38 deletions

View file

@ -1,60 +1,57 @@
{ fetchurl, fetchpatch, lib, stdenv, makeWrapper { lib, stdenv, fetchurl
, pkg-config, intltool, gettext, gtk2, expat, curl , docbook_xml_dtd_45, docbook_xsl, intltool, itstool, libxslt, pkg-config, wrapGAppsHook, yelp-tools
, gpsd, bc, file, gnome-doc-utils, libexif, libxml2, libxslt, scrollkeeper , curl, gdk-pixbuf, gtk3, json-glib, libxml2
, docbook_xml_dtd_412, gexiv2, gpsbabel, expect , gpsbabel
, withGeoClue ? true, geoclue2
, withGeoTag ? true, gexiv2
, withMagic ? true, file
, withMapnik ? false, mapnik , withMapnik ? false, mapnik
, withMBTiles ? true, sqlite , withMBTiles ? true, sqlite
, withOAuth ? true, liboauth
, withMd5Hash ? true, nettle , withMd5Hash ? true, nettle
, withGeoClue ? true, geoclue2 }: , withOAuth ? true, liboauth
, withRealtimeGPSTracking ? true, gpsd
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "viking"; pname = "viking";
version = "1.8"; version = "1.9";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/viking/viking/viking-${version}.tar.bz2"; url = "mirror://sourceforge/viking/viking-${version}.tar.bz2";
sha256 = "1a0g0fbj4q5s9p8fv0mqvxws10q3naj81l72sz30vvqpbz6vqp45"; sha256 = "0fybpy6k0vmjp231h5ckysl3c0rcnh2afznijwq6y78j4hywyjpy";
}; };
patches = [ nativeBuildInputs = [ docbook_xml_dtd_45 docbook_xsl intltool itstool libxslt pkg-config wrapGAppsHook yelp-tools ];
# Fix build without mapnik and sqlite https://github.com/viking-gps/viking/pull/79
(fetchpatch {
url = "https://github.com/viking-gps/viking/commit/995feefcb97bdb1590ed018224cf47ce197fe0c1.patch";
sha256 = "1xb0b76kg690fag9mw3yfj5k766jmqp1sm8q4f29n1h3nz5g8izd";
})
];
nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ curl gdk-pixbuf gtk3 json-glib libxml2 ]
buildInputs = [ intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils
libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2
] ++ lib.optional withMapnik mapnik
++ lib.optional withGeoClue geoclue2 ++ lib.optional withGeoClue geoclue2
++ lib.optional withGeoTag gexiv2
++ lib.optional withMagic file
++ lib.optional withMapnik mapnik
++ lib.optional withMBTiles sqlite
++ lib.optional withMd5Hash nettle ++ lib.optional withMd5Hash nettle
++ lib.optional withOAuth liboauth ++ lib.optional withOAuth liboauth
++ lib.optional withMBTiles sqlite; ++ lib.optional withRealtimeGPSTracking gpsd;
configureFlags = [ configureFlags = [
"--disable-scrollkeeper"
(lib.enableFeature withMapnik "mapnik")
(lib.enableFeature withGeoClue "geoclue") (lib.enableFeature withGeoClue "geoclue")
(lib.enableFeature withMd5Hash "nettle") (lib.enableFeature withGeoTag "geotag")
(lib.enableFeature withOAuth "oauth") (lib.enableFeature withMagic "magic")
(lib.enableFeature withMapnik "mapnik")
(lib.enableFeature withMBTiles "mbtiles") (lib.enableFeature withMBTiles "mbtiles")
(lib.enableFeature withMd5Hash "nettle")
(lib.enableFeature withOAuth "oauth")
(lib.enableFeature withRealtimeGPSTracking "realtime-gps-tracking")
]; ];
preBuild = '' hardeningDisable = [ "format" ];
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; doCheck = true;
postInstall = '' preFixup = ''
wrapProgram $out/bin/viking \ gappsWrapperArgs+=(
--prefix PATH : "${gpsbabel}/bin" \ --prefix PATH : ${lib.makeBinPath [ gpsbabel ]}
--prefix PATH : "${expect}/bin" )
''; '';
meta = with lib; { meta = with lib; {

View file

@ -9012,9 +9012,7 @@ in
inherit lib udisks2 python3; inherit lib udisks2 python3;
}; };
viking = callPackage ../applications/misc/viking { viking = callPackage ../applications/misc/viking { };
inherit (gnome2) scrollkeeper;
};
vim-vint = callPackage ../development/tools/vim-vint { }; vim-vint = callPackage ../development/tools/vim-vint { };