diff options
| -rw-r--r-- | pkgs/tools/misc/osm2pgsql/default.nix | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index 67e0c2b21d8..f14fb526997 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -1,28 +1,26 @@ -{ stdenv, fetchgit, cmake, expat, proj, bzip2, zlib, boost, postgresql, lua}: +{ stdenv, fetchFromGitHub, cmake, expat, proj, bzip2, zlib, boost, postgresql, lua}: -let - version = "0.92.1-unstable"; -in stdenv.mkDerivation rec { name = "osm2pgsql-${version}"; + version = "0.96.0"; - src = fetchgit { - url = "https://github.com/openstreetmap/osm2pgsql.git"; - rev = "2b72b2121e91b72b0db6911d65c5165ca46d9d66"; - # Still waiting on release after: - # https://github.com/openstreetmap/osm2pgsql/pull/684 - # https://github.com/openstreetmap/osm2pgsql/issues/634 - #rev = "refs/tags/${version}"; - sha256 = "1v6s863zsv9p2mni35gfamawj0xr2cv2p8a31z7sijf8m6fn0vpy"; + src = fetchFromGitHub { + owner = "openstreetmap"; + repo = "osm2pgsql"; + rev = version; + sha256 = "032cydh8ynaqfhdzmkvgbmqyjql668y6qln1l59l2s3ni9963bbl"; }; - nativeBuildInputs = [cmake]; - buildInputs = [expat proj bzip2 zlib boost postgresql lua]; - meta = { + nativeBuildInputs = [ cmake ]; + + buildInputs = [ expat proj bzip2 zlib boost postgresql lua ]; + + NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" ]; + + meta = with stdenv.lib; { description = "OpenStreetMap data to PostgreSQL converter"; - version = "0.92.1-unstable"; homepage = https://github.com/openstreetmap/osm2pgsql; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; }; } |