Merge pull request #256727 from sikmir/gpx-viewer

gpx-viewer: 0.4.0 → 0.5.0

authored by Nikolay Korotkiy and committed by GitHub 1a6b49ed e9197428

+41 -14
+41 -14
pkgs/applications/misc/gpx-viewer/default.nix
··· 1 - { lib, stdenv, fetchurl, intltool, libxml2, pkg-config, gnome, libchamplain, gdl, wrapGAppsHook }: 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , fetchpatch 5 + , libxml2 6 + , meson 7 + , ninja 8 + , vala 9 + , pkg-config 10 + , gnome 11 + , libchamplain 12 + , gdl 13 + , wrapGAppsHook 14 + }: 2 15 3 16 stdenv.mkDerivation rec { 4 17 pname = "gpx-viewer"; 5 - version = "0.4.0"; 18 + version = "0.5.0"; 6 19 7 - src = fetchurl { 8 - url = "https://launchpad.net/gpx-viewer/trunk/${version}/+download/${pname}-${version}.tar.gz"; 9 - sha256 = "956acfaf870ac436300cd9953dece630df7fd7dff8e4ae2577a6002884466f80"; 20 + src = fetchFromGitHub { 21 + owner = "DaveDavenport"; 22 + repo = "gpx-viewer"; 23 + rev = version; 24 + hash = "sha256-6AChX0UEIrQExaq3oo9Be5Sr13+POHFph7pZegqcjio="; 10 25 }; 11 26 12 - patches = fetchurl { 13 - url = "https://code.launchpad.net/~chkr/gpx-viewer/gtk3-bugfix/+merge/260766/+preview-diff/628965/+files/preview.diff"; 14 - sha256 = "1yl7jk7skkcx10nny5zdixswcymjd9s9c1zhm1i5y3aqhchvmfs7"; 15 - }; 16 - patchFlags = [ "-p0" ]; 17 - 18 - configureFlags = [ "--disable-database-updates" ]; 27 + patches = [ 28 + # Compile with libchamplain>=0.12.21 29 + (fetchpatch { 30 + url = "https://github.com/DaveDavenport/gpx-viewer/commit/12ed6003bdad840586351bdb4e00c18719873c0e.patch"; 31 + hash = "sha256-2/r0M3Yxj+vWgny1Pd5G7NYMb0uC/ByZ7y3tqLVccOc="; 32 + }) 33 + ]; 19 34 20 35 nativeBuildInputs = [ 21 - intltool pkg-config 36 + meson 37 + ninja 38 + pkg-config 39 + vala 22 40 wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system 23 41 ]; 24 - buildInputs = [ gdl libchamplain gnome.adwaita-icon-theme libxml2 ]; 42 + 43 + buildInputs = [ 44 + gdl 45 + libchamplain 46 + gnome.adwaita-icon-theme 47 + libxml2 48 + ]; 49 + 50 + hardeningDisable = [ "format" ]; 25 51 26 52 meta = with lib; { 27 53 homepage = "https://blog.sarine.nl/tag/gpxviewer/"; 28 54 description = "Simple tool to visualize tracks and waypoints stored in a gpx file"; 55 + changelog = "https://github.com/DaveDavenport/gpx-viewer/blob/${src.rev}/NEWS"; 29 56 platforms = with platforms; linux; 30 57 license = licenses.gpl2Plus; 31 58 maintainers = with maintainers; [ dotlambda ];