pyrox.dev
gosmore: fix src, build with gcc 13
+12
-10
pkgs/applications/misc/gosmore/default.nix
+12
-10
pkgs/applications/misc/gosmore/default.nix
···
1
-
{ lib, stdenv, fetchsvn, libxml2, gtk2, curl, pkg-config } :
2
3
stdenv.mkDerivation rec {
4
pname = "gosmore";
5
-
version = "31801";
6
-
# the gosmore svn repository does not lock revision numbers of its externals
7
-
# so we explicitly disable them to avoid breaking the hash
8
-
# especially as the externals appear to be unused
9
-
src = fetchsvn {
10
-
url = "http://svn.openstreetmap.org/applications/rendering/gosmore";
11
-
sha256 = "0qsckpqx7i7f8gkqhkzdamr65250afk1rpnh3nbman35kdv3dsxi";
12
-
rev = version;
13
-
ignoreExternals = true;
14
};
15
16
buildInputs = [ libxml2 gtk2 curl ];
17
···
19
20
prePatch = ''
21
sed -e '/curl.types.h/d' -i *.{c,h,hpp,cpp}
22
'';
23
24
patches = [ ./pointer_int_comparison.patch ];
···
1
+
{ lib, stdenv, fetchFromGitHub, libxml2, gtk2, curl, pkg-config }:
2
3
stdenv.mkDerivation rec {
4
pname = "gosmore";
5
+
version = "unstable-2014-03-17";
6
+
7
+
src = fetchFromGitHub {
8
+
owner = "openstreetmap";
9
+
repo = "svn-archive";
10
+
rev = "89b1fbfbc9e9a8b5e78795fd40bdfa60550322fc";
11
+
sparseCheckout = [ "applications/rendering/gosmore" ];
12
+
hash = "sha256-MfuJVsyGWspGNAFD6Ktbbyawb4bPwUITe7WkyFs6JxI=";
13
};
14
+
15
+
sourceRoot = "${src.name}/applications/rendering/gosmore";
16
17
buildInputs = [ libxml2 gtk2 curl ];
18
···
20
21
prePatch = ''
22
sed -e '/curl.types.h/d' -i *.{c,h,hpp,cpp}
23
+
sed -e "24i #include <ctime>" -e "s/data/dat/g" -i jni/libgosm.cpp
24
'';
25
26
patches = [ ./pointer_int_comparison.patch ];
+1
-1
pkgs/top-level/all-packages.nix
+1
-1
pkgs/top-level/all-packages.nix