diff options
| author | Symphorien Gibol <symphorien+git@xlumurb.eu> | 2018-03-18 00:45:53 +0100 |
|---|---|---|
| committer | Symphorien Gibol <symphorien+git@xlumurb.eu> | 2018-03-18 00:48:36 +0100 |
| commit | d6aff3d65b6cb966b026fe072f3a7127e82466a4 (patch) | |
| tree | d626b61d2f8f96a107befdae492dbeb5ad2122d3 /pkgs/applications/misc/gosmore | |
| parent | 4ee9d0508653de1d626c1ee81374acdd422fc37d (diff) | |
| download | nixpkgs-d6aff3d65b6cb966b026fe072f3a7127e82466a4.tar nixpkgs-d6aff3d65b6cb966b026fe072f3a7127e82466a4.tar.gz nixpkgs-d6aff3d65b6cb966b026fe072f3a7127e82466a4.tar.bz2 nixpkgs-d6aff3d65b6cb966b026fe072f3a7127e82466a4.tar.lz nixpkgs-d6aff3d65b6cb966b026fe072f3a7127e82466a4.tar.xz nixpkgs-d6aff3d65b6cb966b026fe072f3a7127e82466a4.tar.zst nixpkgs-d6aff3d65b6cb966b026fe072f3a7127e82466a4.zip | |
gosmore: fix build with gcc7
Diffstat (limited to 'pkgs/applications/misc/gosmore')
| -rw-r--r-- | pkgs/applications/misc/gosmore/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/misc/gosmore/pointer_int_comparison.patch | 11 |
2 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix index 8936d3f222f..464e0ba5334 100644 --- a/pkgs/applications/misc/gosmore/default.nix +++ b/pkgs/applications/misc/gosmore/default.nix @@ -22,6 +22,9 @@ stdenv.mkDerivation { prePatch = '' sed -e '/curl.types.h/d' -i *.{c,h,hpp,cpp} ''; + + patches = [ ./pointer_int_comparison.patch ]; + patchFlags = [ "-p1" "--binary" ]; # patch has dos style eol meta = with stdenv.lib; { description = "Open Street Map viewer"; diff --git a/pkgs/applications/misc/gosmore/pointer_int_comparison.patch b/pkgs/applications/misc/gosmore/pointer_int_comparison.patch new file mode 100644 index 00000000000..4a715b6d859 --- /dev/null +++ b/pkgs/applications/misc/gosmore/pointer_int_comparison.patch @@ -0,0 +1,11 @@ +--- blah_/jni/gosmore.cpp 1970-01-01 01:00:01.000000000 +0100 ++++ /dev/stdin 2018-03-18 00:21:08.474217132 +0100 +@@ -1273,7 +1273,7 @@ + if (deg[i] < -180 || deg[i] > 180) break; + if (i == 0 && (strncasecmp (t, "lat", 3) == 0 || + strncasecmp (t, "lon", 3) == 0)) { // lat=-25.7 lon=28.2 +- for (t += 3; t != '\0' && !isalnum (*t); t++) {} ++ for (t += 3; *t != '\0' && !isalnum (*t); t++) {} + } + if (i == 1) { // Success ! + //printf ("%lf %lf %u\n", deg[lonFirst ? 1 : 0], deg[lonFirst ? 0 : 1], |