diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index ece081830328..1e310fb4c1e0 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "osm2pgsql"; - version = "1.7.2"; + version = "1.8.0"; src = fetchFromGitHub { owner = "openstreetmap"; repo = "osm2pgsql"; rev = finalAttrs.version; - hash = "sha256-KJkqzvsm0IMaqeKnIbLGeOSJrsLvW+z7lCg6NbuU13g="; + hash = "sha256-v+/pT8HnLoeeYe33v4xUoR5YWD/jHgEG/Q11Trw9X2s="; }; postPatch = '' @@ -35,14 +35,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - buildInputs = [ expat fmt proj bzip2 zlib boost postgresql libosmium protozero rapidjson ] + buildInputs = [ expat fmt proj bzip2 zlib boost postgresql libosmium protozero ] ++ lib.optional withLuaJIT luajit ++ lib.optional (!withLuaJIT) lua; cmakeFlags = [ "-DEXTERNAL_LIBOSMIUM=ON" "-DEXTERNAL_PROTOZERO=ON" - "-DEXTERNAL_RAPIDJSON=ON" "-DEXTERNAL_FMT=ON" ] ++ lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON";