gosmore: update, fix checksum

This commit is contained in:
Nikolay Amiantov 2014-11-19 15:30:59 +03:00
parent daa9e53e26
commit bddffb705f
2 changed files with 18 additions and 24 deletions

View File

@ -1,34 +1,30 @@
a@{fetchsvn, libxml2, gtk, curl, pkgconfig, lib, ...} : { stdenv, fetchsvn, libxml2, gtk, curl, pkgconfig } :
let
fetchsvn = a.fetchsvn;
buildInputs = with a; [ let
libxml2 gtk curl pkgconfig version = "30811";
];
in in
rec { stdenv.mkDerivation {
name = "gosmore-r${version}";
src = fetchsvn { src = fetchsvn {
url = http://svn.openstreetmap.org/applications/rendering/gosmore; url = http://svn.openstreetmap.org/applications/rendering/gosmore;
sha256 = "0ds61gl75rnzvm0hj9papl5sfcgdv4310df9ch7x9rifssfli9zm"; sha256 = "0qyvrb4xgy4msc7f65widzkvjzc8mlddc4dyr1i76b7wd3gpk0xj";
rev = "24178"; rev = "${version}";
} + "/"; };
inherit buildInputs; buildInputs = [ libxml2 gtk curl ];
configureFlags = [];
/* doConfigure should be removed if not needed */ nativeBuildInputs = [ pkgconfig ];
phaseNames = ["fixCurlIncludes" "doConfigure" "doMakeInstall"];
fixCurlIncludes = a.fullDepEntry '' prePatch = ''
sed -e '/curl.types.h/d' -i *.{c,h,hpp,cpp} sed -e '/curl.types.h/d' -i *.{c,h,hpp,cpp}
'' ["minInit" "doUnpack"]; '';
name = "gosmore-r21657"; meta = with stdenv.lib; {
meta = {
description = "Open Street Map viewer"; description = "Open Street Map viewer";
maintainers = [ homepage = http://sourceforge.net/projects/gosmore/;
a.lib.maintainers.raskin maintainers = with maintainers; [
raskin
]; ];
platforms = a.lib.platforms.linux; platforms = platforms.linux;
}; };
} }

View File

@ -9800,9 +9800,7 @@ let
libpng = libpng12; libpng = libpng12;
}; };
gosmore = builderDefsPackage ../applications/misc/gosmore { gosmore = callPackage ../applications/misc/gosmore { };
inherit fetchsvn curl pkgconfig libxml2 gtk;
};
gpsbabel = callPackage ../applications/misc/gpsbabel { }; gpsbabel = callPackage ../applications/misc/gpsbabel { };