diff options
author | Nikolay Korotkiy <sikmir@disroot.org> | 2022-08-15 11:04:01 +0300 |
---|---|---|
committer | Nikolay Korotkiy <sikmir@disroot.org> | 2022-08-16 02:45:02 +0300 |
commit | 38f9a57c3b3fe2e50da3175fd98e545e27b3ac0e (patch) | |
tree | 8e19764f2a30fce087d9bf9af35a28e27ed13007 /pkgs/tools/misc/osm2pgsql | |
parent | 5c37f7fa7e6571cbd86d690e8a662809b6f0df06 (diff) |
osm2pgsql: 1.6.0 → 1.7.0
Diffstat (limited to 'pkgs/tools/misc/osm2pgsql')
-rw-r--r-- | pkgs/tools/misc/osm2pgsql/default.nix | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index 0a3103cd4f94c..297f98ee3db3d 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , cmake , expat +, fmt , proj , bzip2 , zlib @@ -12,33 +13,43 @@ , luajit , libosmium , protozero +, rapidjson }: stdenv.mkDerivation rec { pname = "osm2pgsql"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "openstreetmap"; repo = pname; rev = version; - sha256 = "sha256-6FVMv+DowMYdRdsQFL2iwG/V9D2cLWkHUVkmR3/TuUI="; + hash = "sha256-MWJzCZdqvy/nH1Doj0fmGuzTubaHDnPOED7qgzvJ3ZU="; }; + postPatch = '' + # Remove bundled libraries + rm -r contrib + ''; + nativeBuildInputs = [ cmake ]; - buildInputs = [ expat proj bzip2 zlib boost postgresql libosmium protozero ] + buildInputs = [ expat fmt proj bzip2 zlib boost postgresql libosmium protozero rapidjson ] ++ lib.optional withLuaJIT luajit ++ lib.optional (!withLuaJIT) lua; - cmakeFlags = [ "-DEXTERNAL_LIBOSMIUM=ON" "-DEXTERNAL_PROTOZERO=ON" ] - ++ lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON"; + cmakeFlags = [ + "-DEXTERNAL_LIBOSMIUM=ON" + "-DEXTERNAL_PROTOZERO=ON" + "-DEXTERNAL_RAPIDJSON=ON" + "-DEXTERNAL_FMT=ON" + ] ++ lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON"; meta = with lib; { description = "OpenStreetMap data to PostgreSQL converter"; homepage = "https://osm2pgsql.org"; license = licenses.gpl2Plus; - platforms = with platforms; linux ++ darwin; + platforms = platforms.unix; maintainers = with maintainers; [ jglukasik das-g ]; }; } |