diff options
author | Robert Scott <code@humanleg.org.uk> | 2022-08-16 00:46:01 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-16 00:46:01 +0100 |
commit | a093c35beee0a64ad68312d747a4c49eaa5b1105 (patch) | |
tree | d950d67bfbeb236fad920c38e4f72e39e1f17ede /pkgs | |
parent | 0442e4020f535a12067c2add4e226f0c58a07732 (diff) | |
parent | 38f9a57c3b3fe2e50da3175fd98e545e27b3ac0e (diff) | |
download | nixpkgs-a093c35beee0a64ad68312d747a4c49eaa5b1105.tar nixpkgs-a093c35beee0a64ad68312d747a4c49eaa5b1105.tar.gz nixpkgs-a093c35beee0a64ad68312d747a4c49eaa5b1105.tar.bz2 nixpkgs-a093c35beee0a64ad68312d747a4c49eaa5b1105.tar.lz nixpkgs-a093c35beee0a64ad68312d747a4c49eaa5b1105.tar.xz nixpkgs-a093c35beee0a64ad68312d747a4c49eaa5b1105.tar.zst nixpkgs-a093c35beee0a64ad68312d747a4c49eaa5b1105.zip |
Merge pull request #186762 from sikmir/osm2pgsql
osm2pgsql: 1.6.0 → 1.7.0
Diffstat (limited to 'pkgs')
-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 0a3103cd4f9..297f98ee3db 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 ]; }; } |