mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 11:40:45 +00:00
Code Issues Wiki Activity

gosmore: fix src, build with gcc 13

Browse source
This commit is contained in:
Weijia Wang 2023-12-09 17:53:30 +01:00
parent 9aedfde2aa
commit bcf9e13dff
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
pkgs/applications/misc/gosmore/default.nix
View file

@ -1,24 +1,26 @@
{ lib, stdenv, fetchsvn, libxml2, gtk2, curl, pkg-config } :
{ lib, stdenv, fetchFromGitHub, libxml2, gtk2, curl, pkg-config }:
stdenv.mkDerivation rec {
pname = "gosmore";
version = "31801";
# the gosmore svn repository does not lock revision numbers of its externals
# so we explicitly disable them to avoid breaking the hash
# especially as the externals appear to be unused
src = fetchsvn {
url = "http://svn.openstreetmap.org/applications/rendering/gosmore";
sha256 = "0qsckpqx7i7f8gkqhkzdamr65250afk1rpnh3nbman35kdv3dsxi";
rev = version;
ignoreExternals = true;
version = "unstable-2014-03-17";
src = fetchFromGitHub {
owner = "openstreetmap";
repo = "svn-archive";
rev = "89b1fbfbc9e9a8b5e78795fd40bdfa60550322fc";
sparseCheckout = [ "applications/rendering/gosmore" ];
hash = "sha256-MfuJVsyGWspGNAFD6Ktbbyawb4bPwUITe7WkyFs6JxI=";
};
sourceRoot = "${src.name}/applications/rendering/gosmore";
buildInputs = [ libxml2 gtk2 curl ];
nativeBuildInputs = [ pkg-config ];
prePatch = ''
sed -e '/curl.types.h/d' -i *.{c,h,hpp,cpp}
sed -e "24i #include <ctime>" -e "s/data/dat/g" -i jni/libgosm.cpp
'';
patches = [ ./pointer_int_comparison.patch ];

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

@ -32302,7 +32302,7 @@ with pkgs;
gostatic = callPackage ../applications/misc/gostatic { };
gosmore = callPackage ../applications/misc/gosmore { stdenv = gcc10StdenvCompat; };
gosmore = callPackage ../applications/misc/gosmore { };
gossa = callPackage ../applications/networking/gossa { };